More Keyboard updates