Cosmetic change
Massive improvement to url handling.