corrected comments
cleanup and update of comments