Several bugfixes, still testing interpolation