Remove todo comments that have been fixed, add two or three more comments