update S3 stuff and url_for overriding