Finish first pass at comment sync