Movement touchup

Also contains some Key touchups