Fixed some funky physics issues, particularly mass calculations were all wrong