More YSLD updates based on testing and feedback