* wizard improvements