Resolved dictionaries and mol weight calculators

Dictionaries and functions for calculating the molecular weights have
been resolved