Minor operations changes

Small changes to how they interact for smoother operation.  Server does
still hang once a client quits though.