bug fixes with keyboard commands