Tweaked a thing or two

Changed things to be more relevant to the server.