Remediation framework: worked out a few kinks