removed some more  path references and a couple other minor changes for AWS