More fixes + more debug code
Merge pull request #4 from JHaun/FirstFixes

More fixes + more debug code