Working on paths.
Some path fixes.