fix paths, maybe
more work on paths, still shaky