Fixes and improvements to Server, Overlay

Tidying up some loose ends.
If you want to do that sort of thing then you need to add it yourself, and it has to go through the code review process. The scope of my change was just a cosmetic make-over in identifying the peer and making the messages a little shorter.