a few more last minute changes to wizard syntax