adjustments to the addresses (not complete, yet)