Simplify wizard, update docs