Made s3 bucket an argument to harvesting, cleaned up filename business