Clean up some more mess
Fix support for relative paths and homedir shortcuts