Add s3 storage and tweak a few things
Update README