xkeyboard improvements in progress