fixes to rotor tracking