Fixing noise and interpolation bugs