Improved movement and collision