More features and hardening of the wizard code