Transfer storage to Amazon S3
Minor fixes