Some tidying up of the keyboard.js module
Updated TODO list