Added vanity link name support and found one little buglet.