Added and adjusted comments