adjusted tax calc, added 'single' rates/calcs