removed Environment.java, more TODO:'s and comment deletions. Also switched the negation of mass in fixed mass to take place in the factory