Fix address. Shorten name.