Change file bucket, and minor bug fixes