some address improvements