Some fixes

Mehhh, lame
Merge branch 'master' of https://github.com/TAWTonic/Altis-Life