add more TODO comments