Fixed a load of small things