fixup endpoint disconnection, move heartbeat setup