Smooth movement and bug fixes