Fixed some interpolation, removed some cruft.