Up heartbeat interval to 10 seconds and other tidying