more fixes
Merge pull request #1 from tenach/master

Cleaned up! ohgod