Improved clients and server comms