Fixes

Fixed basically everything -.-
Merge pull request #1 from ultiferrago/master

Fixes