multiple fixes
Merge pull request #138 from dewguzzler/master

fixed problems