updated comments & minor changes