Some beauty changes;
Merge branch 'master' of https://github.com/cryser29/SmashTheEvil