calibrating and improvments