Fixes per Ben's punch list

Fixes for CPR calculation, other corrections. Fixes all of the
"must-do" items.