Fixed Input registration and some CR's.

Fixed Input registration and some CR's.