Fixed a load of stuff.