Fixed fill buff area, added new calibrate method stubs