Tweaked a thing or two

Changed things to be more relevant to the server.
Merge pull request #16 from Xeom/patch-6

Tweaked a thing or two