more TODO notes in comments