Keyboard Control improvments