Fix incorrect addressing

Address == Address1 == The first residence address

Mail == The mailing address

This might benefit from logic to say that if there's no mailing address,
use the residence address, and so on.