Michael S3 backend mods

Just a few changes I found I needed. If you have questions, let me know.