merged origin/develop + cleanup commits

hmm, not sure if i did something wrong, but:

/cheat /crash doesn't work with this change...

the "big" problem here is/was that you made your changes in the master branch.