Fixed a load of things