Updating the script to not require the association of an AWS Account, plus some other general corrections.