More reconnect stuff

Signed-off-by: Jamie White <hello@jamie-white.com>
More auto-reconnect bits

Signed-off-by: Jamie White <hello@jamie-white.com>