update TODO comments in this branch