Feature last must haves

Implementation of the last two must haves.
Just name it how
capaticals in URL's is not that smart...

And also fix indentation again, because now it's inconsistent