Hitbox integration and further performance improvements :)