Clients disconnect safely

no longer waits indefinately