correct ordering and other bugs in tax updates