incorporate review feedback, and resolve remaining FIXMEs