S3 strategy
Tweaks and docs