wizard improvments