A bit of work on key stroke support.