keypad update and bug fixed