a bunch of small changes/bug fixes

shouldn't have changed much that anyone could see
Merge branch 'master' of https://github.com/Yacob/TowerDefense