Checkpoint: Server disconnection is working better (still stuff to do)