Added S3 storage and finetuning of templates.