Added and modified comments