Fixing a few things
Merge pull request #97 from ALouis38/quickfixes

Fixing a few things