Polish things
Fix critical bug
Get s3 working