Fix errors and typo's, improve comments