Made some changes that should hopefully make it easier to run the project on other systems