working keypad -- cleanups