Fix some keyboard processing errors in typewright.
Fix the typewright line's history to include the user's local edit.
Merge remote-tracking branch 'origin/master'