add/refine some comments