more improovements