bug fix in Interpolation.h + add TODO