Fixed some typos in the comments and some layout