fixed a bunch of errors and typo's