add tax calc and clean up address info