Improvements

Sort of followup to previous commit G54-G59.3 is much better <img width="1572" height="1118" alt="Screenshot 2025-10-06 8 33 28 AM" src="https://github.com/user-attachments/assets/b7e7ee10-67d2-4ca7-b5a0-76c18a95e525" /> more TBA