Fixed some things broke others.
Merge branch 'master' of https://github.com/Diolex/The-Hoppening