latest round of CTB comments/fixes