Molecule set cleanup 

Fixes various incorrect formulates and other such errors.