Improvements to wizard