Bugs seen by now fixed completely. Keyboard Control to add last.