Feature/enriched url

Fixing the annotations @dfarr made in #3 . These are #4, #5 and #6 .
Unfortunately I hit the yolo button, so this is the pull request fixing #3 .