updated key controls partly
merge