Remediation framework: worked out a few MORE kinks