fixed errors

Fixed all that I could find.