added few more TODO comments