Changes to aid ease of initial setup

Updated multiple files to make it easier for setup on other developers machines.