updated file locations and fixed debug messages