Remove some done TODOs and reword/rearrange some others