several fixes for things that were botched on #200
Merge pull request #217 from misterdorm/pr200fixes

several fixes for things that were botched on #200