Changed a few comments for TODO lists