am efd3266b: Input improvements and bug fixes.

* commit 'efd3266b719eed5f1b217021c0a9e76e4b274b06':
  Input improvements and bug fixes.