Commit

Fine tune keystroke capture