Misc project fixes
Merge pull request #7 from GregPrice24/miscFixes

Misc project fixes