Fixes and improvements to Server, Overlay

Tidying up some loose ends.
Not worth logging the hash of the candidate set?