conserved moieties are now alwasy calculated as amounts, fixed few other C.M. issues