started work on cleanup
Merge branch 'master' of https://github.com/IronManMod/IronMan into cleanedcode