Update 2 which added keyboard usage feature
Small code fixes