AdaptiveControl: various changes