Updated TODO comments