fix comments and typos