cleanup code in ClientState
made client return to Launcher on lost connection
solved mergeconflict