Updates to the TCP server, plus fix for settings