More stability fixes

Should handle if connection dies during calibration now.