Changed filenames around. Fixed a few minor things.