fixes-and-improvements-04/04/2025