Fixed a lot more errors.