Updates to comments based on TF discussion