zero unit and quoted path

I saw your refactoring branch and added the same changes here