Fixes a few setup bugs
Merge pull request #34 from sleepers-anonymous/fix-setup-bugs

Fixes a few setup bugs