Various improvements on CLI, small changes on Keyboard driver