keyboard, bug fixing