r1823 + now fix URLs...