Interpolation tweaks

I don't like this algorithm but this will have to do for now