Update adaptive interaction - clean up and tuning.