S3 image uploading and other improvements