more wizard mode changes