Final updates to tax address stuff