add taxclass kludge to gateway overrides, fix parsing of new-style paybatch