Minor Adjustments Update

This update focuses on behind-the-scenes improvements and adjustments to support upcoming features. No visible changes for now, but these refinements help set the stage for what's next. Thanks!