Fixing up the way buttons are processed, and a fix to Timer2.