Tiny Changes

Simple debug fix, and ability to terminate clients.
I have a large changeset locally but that depends on the outcome of my email :)