Removed average mass completely from Mass object, added it onoly to chemical formula
Minor fixes