Tweaked a few bits and pieces
Merge pull request #6 from PopShack/moreAuth

Tweaked a few bits and pieces
Merge pull request #7 from PopShack/develop

Develop