interp & prediction improvements