improved tax calc...now, if it only would work...