Fixing up a few things, and deleting a file I was using for testing