Adjust difference reporting; clean some TODOs