Corrections to allow for subdiesctory install

There is a double call to Url() which, when installed in a subdirectory will cause the subdirectory to be added in twice.