add Switch and model.IgnoreValves gates
symmetrize/simplify debug printout