Add/refine comments