Found more errors. Fixed.