Further improvements to map and character hitbox