Added TCPCalibration class + some fixes