some updates to the moment_calc