cleanup
add keyboard controls