Fixes and improvements to Server, Overlay

Tidying up some loose ends.
No idea, I just edited what was already there