selective patches applied

Heartbeat patch & attribute error applied.

I'm positive the attribute error patch is/was needed. I'm not sure if the heartbeat patch was/is needed.

I did NOT include man other patches because they didn't/don't seem mission critical.