Auto-Upload to AWS and a couple of code changes