Handle client disconnects
Simplify code a great deal
fixup! Handle client disconnects