fixed some of the bugs, oops my bad
Merge branch 'master' of github.com:er1/cloaked-dangerzone