Rejig how the client connects to the server (force localhost only)
A couple of small fixes