Wip diffusion cleanup

This addresses Dan's last round of comments fixes the merge issues with wip_diffusion.