Added/Corrected comments