Better tax handling (reverts last commit)