adding a comment; deleting a TODO; taking care of yet another flag