Improved pluspath() and used it instead of path() where appropriate.