added keyboard controls
merged