Misc fixes and renames
Merge pull request #28 from EWUTinfoilHats/Fixes

Misc fixes and renames