misc bug fixes, s3 image upload