some fixes
Revert "some fixes"

This reverts commit 1d35a91ff111061ddf11a5e995f1206336b8b40d.
Merge branch 'master' of https://github.com/cheriekeks/Chaosmagic
work damnit