Update TODO comments