Polished some stuff
Merge pull request #18 from billheys92/preferences-fixes

Polished some stuff