more heartbeat fixing shit