Added debug switches