further improvements to reward matching