Test for url starting with "domainkey/" - not "/domainkey"

Remove a couple of unneeded parameters.

Add a load of "final"