Fixed a lot of things - by Ben