debug tweaks
support $SPACE_SEPARATED_GROUPS rerun variable
template indentation tidying