Fixes and improvements to Server, Overlay

Tidying up some loose ends.
close is not friendly at all. The shutdown needs to be improved. Beyond the scope of this change set.