Fixing some keypad stuff and also getting ready for the new keypad controller.