various updates including wizard