Cleaned things up, added datestamps to file names