Fixed AWS key stuff, adjusted other filenames.
Various fixes and updates.