Minor tweaks, plus group-deletion for shield wall sections