added/corrected comments