Several improvements

The first two commits address #98. The others are self-explanatory. CloudFront and S3 are now complete.