Fixes and stuff
Merge branch 'Development' of github.com:FlansMods/FlansMod into Development