added / updated comments