Fixed Issue # 45, changed some of the delete features of the wizard as well.