corrected comments and doc