some changes to overall comments