Keyboard seems to be working now and is really good (other than the problems with rebooting if using google that are widely publicised). My best guess is that a reboot fixed the problem with the wrong layout being used.

Max