some fixes :)
Merge pull request #5 from A3Wasteland/fixes

Fixes