Update controller auto handling with some bugs found in 1.6.4
Still a problem holding attack & use at same time