Fixed a bunch more.