Fixed some comments and typos