Couple of fixes, new movement interpolation