Improve documentation and handling

Made sure the moments() function and the make_moments program have the same input for easier implementation.