Wizar mode improvements