tested on the server and all is working as planned. Minor debugging
changes from last build.