finish integrating comments (first pass)