adjust references & defaults