Fixes and improvements to Server, Overlay

Tidying up some loose ends.
Comments need to remove onIOStrand