Some Improvements for Wizard