Yet more TODO/DONE updating.