Minor tweaks etc. Now won't derp when the world is quit with active connections.