update TODO comments