Revert "Nothing much"

This reverts commit e8d592ee4e1e5e4d74297fe4cc6872a582b72794.
Fixed some bugs
Merge branch 'master' of https://github.com/Malow/NotDeadYet