Mostly finished work on fixing wizard problems