Improving AWS scripts. There are still a lot of bugs
Fixing up some bugs in the AWS scripts

It's still not robust at all