Fixes and try to calibrate better