Fixes and improvements to Server, Overlay

Tidying up some loose ends.
There's a world of improvement that can be done in terms of logging in the peer code. All beyond the scope of this change set.