Bunch of bugs fixed!
Merge branch 'master' of github.com:windyarts/satan