Add on_ret callback and remove misses/hits junk