Improved verbosity. Made paths uri-safer.