AdaptiveControl: some code cleanup
AdaptiveControl: fixes