Updated 'comment section'

(Ignore the funky join expressions for now, will update to match
converter 'join as' updates)