fix wizard bugs