Further minor changes. URL scheme works like a charm.