Updated hwtimer machinery to use both TimerA and TimerB (corrections)