Major updates to the interpolation. Fixed an obvious bug.