Wizards added.  Small changes to parts, mostly bug fixes