Add keyboard hints and minor bugs fixed