improve keyboard behaviour and dependencies