Got rid of a few things, neatened/changed other files.