replace more TODO comments with quasi-informative statements