Confirmed simulator works ok.  Tweaks for retesting in hardware