Changed a bunch of things to work on aws.