More bugs fixed, but interpolation still doesn't work for an unknown reason.