Added some server logging and some other minor things