interpolation added / bugs fixed