Fixes for things
Merge pull request #1 from irrationalistic/master

Fixes for things