timedRotationPilot, small bugfixes in other classes
merge conflicts solved