few improovements