Fix #274 - add remaining logging to server
Merge pull request #454 from humphd/issue274

Fix #274 - add remaining logging to server