More fixes...
Merge pull request #3 from JHaun/FirstFixes

More fixes...