mostly working Wizard class; clean up some finer points