lots of comment updates