add keyboard && fix issues
merged