More changes to get it to compile and file path fixes