Don't want to leave y'all high and dry, but I've got something that seems to work ok but needs to be done in a couple more functions in that extension - it involves the ReRoll Feats extension using a function I added to Improved Critical a while back for a similar issue with a different function. I've contacted lprchaun whose gonna try to get to it as soon as time frees up. I'm willing to "make a temporary" build if it's OK with lprchaun, but I gotta clear that first. It wouldn't be "final" but it should work.