Fixes and improvements to Server, Overlay

Tidying up some loose ends.
Thats what it did before