trying to clean up everything for consistency, up to simplified forms.
much clearer, still not sure about the scattering 1st moment term.