add doc & edit/rm comments