Added smoother movement to player.
merge fix