Movement/Selection fixes