more TODO notes