improved wizard interface & behavior