hearbeat improvements