fix various things
Merge pull request #81 from cordoval/81-pr-of-the-night

PR of the night