various adjustments, parameterizing, shifting to templates, etc.