minor fixes to file location + comparison
minor clean up