fixes for the hackathon
Merge pull request #22 from shukbot/hack_fixes

fixes for the hackathon