fixed paths, add more logging