More bug fixes! ~John
Merge branch 'master' of https://github.com/10DaysLeftToLive/TimeWhaleEngine