Removing or updating some TODOs. Work on Progv next.