Molecule set clean up and potion tweaks

For the most part this is complete. there still may be a mol or two that needs to be renamed or a potion that needs to be tweaked, But I tested this and everything seemed good.