diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html
index 446506ad2..fb7f75bbf 100644
--- a/sdrbase/resources/webapi/doc/html2/index.html
+++ b/sdrbase/resources/webapi/doc/html2/index.html
@@ -3582,6 +3582,10 @@ margin-bottom: 20px;
       "format" : "float",
       "description" : "power received in channel (dB)"
     },
+    "trackingDeltaFrequency" : {
+      "type" : "integer",
+      "description" : "difference between channel and PLL or FLL center frequency (Hz)"
+    },
     "squelch" : {
       "type" : "integer",
       "description" : "squelch status (1 if open else 0)"
@@ -33455,7 +33459,7 @@ except ApiException as e:
           </div>
           <div id="generator">
             <div class="content">
-              Generated 2020-06-23T19:48:55.770+02:00
+              Generated 2020-06-27T10:29:00.151+02:00
             </div>
           </div>
       </div>
diff --git a/sdrbase/resources/webapi/doc/swagger/include/AMMod.yaml b/sdrbase/resources/webapi/doc/swagger/include/AMMod.yaml
index 68ecb57b7..a54700d72 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/AMMod.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/AMMod.yaml
@@ -44,7 +44,7 @@ AMModSettings:
     reverseAPIChannelIndex:
       type: integer
     cwKeyer:
-      $ref: "http://swgserver:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
+      $ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
 
 AMModReport:
   description: AMMod
diff --git a/sdrbase/resources/webapi/doc/swagger/include/Airspy.yaml b/sdrbase/resources/webapi/doc/swagger/include/Airspy.yaml
index 79049672a..101d88f5e 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/Airspy.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/Airspy.yaml
@@ -61,7 +61,7 @@ AirspyReport:
     sampleRates:
       type: array
       items:
-        $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/SampleRate"
+        $ref: "/doc/swagger/include/Structs.yaml#/SampleRate"
 
 AirspyActions:
   description: Airspy
diff --git a/sdrbase/resources/webapi/doc/swagger/include/AirspyHF.yaml b/sdrbase/resources/webapi/doc/swagger/include/AirspyHF.yaml
index ddc1618b8..21c51f93b 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/AirspyHF.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/AirspyHF.yaml
@@ -60,7 +60,7 @@ AirspyHFReport:
     sampleRates:
       type: array
       items:
-        $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/SampleRate"
+        $ref: "/doc/swagger/include/Structs.yaml#/SampleRate"
 
 AirspyHFActions:
   description: AirspyHF
diff --git a/sdrbase/resources/webapi/doc/swagger/include/BladeRF2.yaml b/sdrbase/resources/webapi/doc/swagger/include/BladeRF2.yaml
index 6bde2ccf7..ed0e0aadc 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/BladeRF2.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/BladeRF2.yaml
@@ -51,17 +51,17 @@ BladeRF2InputReport:
   description: BladeRF2
   properties:
     frequencyRange:
-      $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/FrequencyRange"
+      $ref: "/doc/swagger/include/Structs.yaml#/FrequencyRange"
     sampleRateRange:
-      $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/Range"
+      $ref: "/doc/swagger/include/Structs.yaml#/Range"
     bandwidthRange:
-      $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/Range"
+      $ref: "/doc/swagger/include/Structs.yaml#/Range"
     globalGainRange:
-      $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/Range"
+      $ref: "/doc/swagger/include/Structs.yaml#/Range"
     gainModes:
       type: array
       items:
-        $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/NamedEnum"
+        $ref: "/doc/swagger/include/Structs.yaml#/NamedEnum"
 
 BladeRF2InputActions:
   description: BladeRF2
@@ -110,13 +110,13 @@ BladeRF2OutputReport:
   description: BladeRF2
   properties:
     frequencyRange:
-      $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/FrequencyRange"
+      $ref: "/doc/swagger/include/Structs.yaml#/FrequencyRange"
     sampleRateRange:
-      $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/Range"
+      $ref: "/doc/swagger/include/Structs.yaml#/Range"
     bandwidthRange:
-      $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/Range"
+      $ref: "/doc/swagger/include/Structs.yaml#/Range"
     globalGainRange:
-      $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/Range"
+      $ref: "/doc/swagger/include/Structs.yaml#/Range"
 
 BladeRF2MIMOSettings:
   description: BladeRF2
diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChannelActions.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChannelActions.yaml
index dcc6496dd..8aab2576b 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/ChannelActions.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/ChannelActions.yaml
@@ -18,4 +18,4 @@ ChannelActions:
       description: Optional for reverse API. This is the channel index from where the message comes from.
       type: integer
     FileSourceActions:
-      $ref: "http://swgserver:8081/api/swagger/include/FileSource.yaml#/FileSourceActions"
+      $ref: "/doc/swagger/include/FileSource.yaml#/FileSourceActions"
diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChannelAnalyzer.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChannelAnalyzer.yaml
index c109ca69d..377aa1af7 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/ChannelAnalyzer.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/ChannelAnalyzer.yaml
@@ -39,6 +39,6 @@ ChannelAnalyzerSettings:
     title:
       type: string
     spectrumConfig:
-      $ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum"
+      $ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum"
     scopeConfig:
-      $ref: "http://swgserver:8081/api/swagger/include/GLScope.yaml#/GLScope"
+      $ref: "/doc/swagger/include/GLScope.yaml#/GLScope"
diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml
index fa36107b9..ab097133d 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml
@@ -18,50 +18,50 @@ ChannelSettings:
       description: Optional for reverse API. This is the channel index from where the message comes from.
       type: integer
     AMDemodSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/AMDemod.yaml#/AMDemodSettings"
+      $ref: "/doc/swagger/include/AMDemod.yaml#/AMDemodSettings"
     AMModSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/AMMod.yaml#/AMModSettings"
+      $ref: "/doc/swagger/include/AMMod.yaml#/AMModSettings"
     ATVDemodSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/ATVDemod.yaml#/ATVDemodSettings"
+      $ref: "/doc/swagger/include/ATVDemod.yaml#/ATVDemodSettings"
     ATVModSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/ATVMod.yaml#/ATVModSettings"
+      $ref: "/doc/swagger/include/ATVMod.yaml#/ATVModSettings"
     BFMDemodSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/BFMDemod.yaml#/BFMDemodSettings"
+      $ref: "/doc/swagger/include/BFMDemod.yaml#/BFMDemodSettings"
     ChannelAnalyzerSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/ChannelAnalyzer.yaml#/ChannelAnalyzerSettings"
+      $ref: "/doc/swagger/include/ChannelAnalyzer.yaml#/ChannelAnalyzerSettings"
     DATVDemodSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/DATVDemod.yaml#/DATVDemodSettings"
+      $ref: "/doc/swagger/include/DATVDemod.yaml#/DATVDemodSettings"
     DSDDemodSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/DSDDemod.yaml#/DSDDemodSettings"
+      $ref: "/doc/swagger/include/DSDDemod.yaml#/DSDDemodSettings"
     FileSourceSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/FileSource.yaml#/FileSourceSettings"
+      $ref: "/doc/swagger/include/FileSource.yaml#/FileSourceSettings"
     FreeDVDemodSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/FreeDVDemod.yaml#/FreeDVDemodSettings"
+      $ref: "/doc/swagger/include/FreeDVDemod.yaml#/FreeDVDemodSettings"
     FreeDVModSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/FreeDVMod.yaml#/FreeDVModSettings"
+      $ref: "/doc/swagger/include/FreeDVMod.yaml#/FreeDVModSettings"
     FreqTrackerSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/FreqTracker.yaml#/FreqTrackerSettings"
+      $ref: "/doc/swagger/include/FreqTracker.yaml#/FreqTrackerSettings"
     NFMDemodSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/NFMDemod.yaml#/NFMDemodSettings"
+      $ref: "/doc/swagger/include/NFMDemod.yaml#/NFMDemodSettings"
     NFMModSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/NFMMod.yaml#/NFMModSettings"
+      $ref: "/doc/swagger/include/NFMMod.yaml#/NFMModSettings"
     LocalSinkSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/LocalSink.yaml#/LocalSinkSettings"
+      $ref: "/doc/swagger/include/LocalSink.yaml#/LocalSinkSettings"
     LocalSourceSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/LocalSource.yaml#/LocalSourceSettings"
+      $ref: "/doc/swagger/include/LocalSource.yaml#/LocalSourceSettings"
     RemoteSinkSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/RemoteSink.yaml#/RemoteSinkSettings"
+      $ref: "/doc/swagger/include/RemoteSink.yaml#/RemoteSinkSettings"
     RemoteSourceSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/RemoteSource.yaml#/RemoteSourceSettings"
+      $ref: "/doc/swagger/include/RemoteSource.yaml#/RemoteSourceSettings"
     SSBModSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/SSBMod.yaml#/SSBModSettings"
+      $ref: "/doc/swagger/include/SSBMod.yaml#/SSBModSettings"
     SSBDemodSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/SSBDemod.yaml#/SSBDemodSettings"
+      $ref: "/doc/swagger/include/SSBDemod.yaml#/SSBDemodSettings"
     UDPSourceSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/UDPSource.yaml#/UDPSourceSettings"
+      $ref: "/doc/swagger/include/UDPSource.yaml#/UDPSourceSettings"
     UDPSinkSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/UDPSink.yaml#/UDPSinkSettings"
+      $ref: "/doc/swagger/include/UDPSink.yaml#/UDPSinkSettings"
     WFMDemodSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/WFMDemod.yaml#/WFMDemodSettings"
+      $ref: "/doc/swagger/include/WFMDemod.yaml#/WFMDemodSettings"
     WFMModSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/WFMMod.yaml#/WFMModSettings"
+      $ref: "/doc/swagger/include/WFMMod.yaml#/WFMModSettings"
diff --git a/sdrbase/resources/webapi/doc/swagger/include/DeviceActions.yaml b/sdrbase/resources/webapi/doc/swagger/include/DeviceActions.yaml
index 03cf6c2a9..beab35b84 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/DeviceActions.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/DeviceActions.yaml
@@ -15,38 +15,38 @@ DeviceActions:
       description: Optional for reverse API. This is the device set index from where the message comes from.
       type: integer
     airspyActions:
-      $ref: "http://swgserver:8081/api/swagger/include/Airspy.yaml#/AirspyActions"
+      $ref: "/doc/swagger/include/Airspy.yaml#/AirspyActions"
     airspyHFActions:
-      $ref: "http://swgserver:8081/api/swagger/include/AirspyHF.yaml#/AirspyHFActions"
+      $ref: "/doc/swagger/include/AirspyHF.yaml#/AirspyHFActions"
     bladeRF1InputActions:
-      $ref: "http://swgserver:8081/api/swagger/include/BladeRF1.yaml#/BladeRF1InputActions"
+      $ref: "/doc/swagger/include/BladeRF1.yaml#/BladeRF1InputActions"
     bladeRF2InputActions:
-      $ref: "http://swgserver:8081/api/swagger/include/BladeRF2.yaml#/BladeRF2InputActions"
+      $ref: "/doc/swagger/include/BladeRF2.yaml#/BladeRF2InputActions"
     fcdProActions:
-      $ref: "http://swgserver:8081/api/swagger/include/FCDPro.yaml#/FCDProActions"
+      $ref: "/doc/swagger/include/FCDPro.yaml#/FCDProActions"
     fcdProPlusActions:
-      $ref: "http://swgserver:8081/api/swagger/include/FCDProPlus.yaml#/FCDProPlusActions"
+      $ref: "/doc/swagger/include/FCDProPlus.yaml#/FCDProPlusActions"
     hackRFInputActions:
-      $ref: "http://swgserver:8081/api/swagger/include/HackRF.yaml#/HackRFInputActions"
+      $ref: "/doc/swagger/include/HackRF.yaml#/HackRFInputActions"
     kiwiSDRActions:
-      $ref: "http://swgserver:8081/api/swagger/include/KiwiSDR.yaml#/KiwiSDRActions"
+      $ref: "/doc/swagger/include/KiwiSDR.yaml#/KiwiSDRActions"
     limeSdrInputActions:
-      $ref: "http://swgserver:8081/api/swagger/include/LimeSdr.yaml#/LimeSdrInputActions"
+      $ref: "/doc/swagger/include/LimeSdr.yaml#/LimeSdrInputActions"
     localInputActions:
-      $ref: "http://swgserver:8081/api/swagger/include/LocalInput.yaml#/LocalInputActions"
+      $ref: "/doc/swagger/include/LocalInput.yaml#/LocalInputActions"
     perseusActions:
-      $ref: "http://swgserver:8081/api/swagger/include/Perseus.yaml#/PerseusActions"
+      $ref: "/doc/swagger/include/Perseus.yaml#/PerseusActions"
     plutoSdrInputActions:
-      $ref: "http://swgserver:8081/api/swagger/include/PlutoSdr.yaml#/PlutoSdrInputActions"
+      $ref: "/doc/swagger/include/PlutoSdr.yaml#/PlutoSdrInputActions"
     remoteInputActions:
-      $ref: "http://swgserver:8081/api/swagger/include/RemoteInput.yaml#/RemoteInputActions"
+      $ref: "/doc/swagger/include/RemoteInput.yaml#/RemoteInputActions"
     rtlSdrActions:
-      $ref: "http://swgserver:8081/api/swagger/include/RtlSdr.yaml#/RtlSdrActions"
+      $ref: "/doc/swagger/include/RtlSdr.yaml#/RtlSdrActions"
     sdrPlayActions:
-      $ref: "http://swgserver:8081/api/swagger/include/SDRPlay.yaml#/SDRPlayActions"
+      $ref: "/doc/swagger/include/SDRPlay.yaml#/SDRPlayActions"
     soapySDRInputActions:
-      $ref: "http://swgserver:8081/api/swagger/include/SoapySDR.yaml#/SoapySDRInputActions"
+      $ref: "/doc/swagger/include/SoapySDR.yaml#/SoapySDRInputActions"
     testSourceActions:
-      $ref: "http://swgserver:8081/api/swagger/include/TestSource.yaml#/TestSourceActions"
+      $ref: "/doc/swagger/include/TestSource.yaml#/TestSourceActions"
     xtrxInputActions:
-      $ref: "http://swgserver:8081/api/swagger/include/Xtrx.yaml#/XtrxInputActions"
+      $ref: "/doc/swagger/include/Xtrx.yaml#/XtrxInputActions"
diff --git a/sdrbase/resources/webapi/doc/swagger/include/DeviceSettings.yaml b/sdrbase/resources/webapi/doc/swagger/include/DeviceSettings.yaml
index f97a77916..7393b6bc7 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/DeviceSettings.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/DeviceSettings.yaml
@@ -15,60 +15,60 @@ DeviceSettings:
       description: Optional for reverse API. This is the device set index from where the message comes from.
       type: integer
     airspySettings:
-      $ref: "http://swgserver:8081/api/swagger/include/Airspy.yaml#/AirspySettings"
+      $ref: "/doc/swagger/include/Airspy.yaml#/AirspySettings"
     airspyHFSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/AirspyHF.yaml#/AirspyHFSettings"
+      $ref: "/doc/swagger/include/AirspyHF.yaml#/AirspyHFSettings"
     bladeRF1InputSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/BladeRF1.yaml#/BladeRF1InputSettings"
+      $ref: "/doc/swagger/include/BladeRF1.yaml#/BladeRF1InputSettings"
     bladeRF2InputSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/BladeRF2.yaml#/BladeRF2InputSettings"
+      $ref: "/doc/swagger/include/BladeRF2.yaml#/BladeRF2InputSettings"
     bladeRF1OutputSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/BladeRF1.yaml#/BladeRF1OutputSettings"
+      $ref: "/doc/swagger/include/BladeRF1.yaml#/BladeRF1OutputSettings"
     bladeRF2OutputSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/BladeRF2.yaml#/BladeRF2OutputSettings"
+      $ref: "/doc/swagger/include/BladeRF2.yaml#/BladeRF2OutputSettings"
     bladeRF2MIMOSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/BladeRF2.yaml#/BladeRF2MIMOSettings"
+      $ref: "/doc/swagger/include/BladeRF2.yaml#/BladeRF2MIMOSettings"
     fcdProSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/FCDPro.yaml#/FCDProSettings"
+      $ref: "/doc/swagger/include/FCDPro.yaml#/FCDProSettings"
     fcdProPlusSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/FCDProPlus.yaml#/FCDProPlusSettings"
+      $ref: "/doc/swagger/include/FCDProPlus.yaml#/FCDProPlusSettings"
     fileInputSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/FileInput.yaml#/FileInputSettings"
+      $ref: "/doc/swagger/include/FileInput.yaml#/FileInputSettings"
     hackRFInputSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/HackRF.yaml#/HackRFInputSettings"
+      $ref: "/doc/swagger/include/HackRF.yaml#/HackRFInputSettings"
     hackRFOutputSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/HackRF.yaml#/HackRFOutputSettings"
+      $ref: "/doc/swagger/include/HackRF.yaml#/HackRFOutputSettings"
     kiwiSDRSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/KiwiSDR.yaml#/KiwiSDRSettings"
+      $ref: "/doc/swagger/include/KiwiSDR.yaml#/KiwiSDRSettings"
     limeSdrInputSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/LimeSdr.yaml#/LimeSdrInputSettings"
+      $ref: "/doc/swagger/include/LimeSdr.yaml#/LimeSdrInputSettings"
     limeSdrOutputSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/LimeSdr.yaml#/LimeSdrOutputSettings"
+      $ref: "/doc/swagger/include/LimeSdr.yaml#/LimeSdrOutputSettings"
     localInputSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/LocalInput.yaml#/LocalInputSettings"
+      $ref: "/doc/swagger/include/LocalInput.yaml#/LocalInputSettings"
     localOutputSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/LocalOutput.yaml#/LocalOutputSettings"
+      $ref: "/doc/swagger/include/LocalOutput.yaml#/LocalOutputSettings"
     perseusSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/Perseus.yaml#/PerseusSettings"
+      $ref: "/doc/swagger/include/Perseus.yaml#/PerseusSettings"
     plutoSdrInputSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/PlutoSdr.yaml#/PlutoSdrInputSettings"
+      $ref: "/doc/swagger/include/PlutoSdr.yaml#/PlutoSdrInputSettings"
     plutoSdrOutputSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/PlutoSdr.yaml#/PlutoSdrOutputSettings"
+      $ref: "/doc/swagger/include/PlutoSdr.yaml#/PlutoSdrOutputSettings"
     rtlSdrSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/RtlSdr.yaml#/RtlSdrSettings"
+      $ref: "/doc/swagger/include/RtlSdr.yaml#/RtlSdrSettings"
     remoteOutputSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/RemoteOutput.yaml#/RemoteOutputSettings"
+      $ref: "/doc/swagger/include/RemoteOutput.yaml#/RemoteOutputSettings"
     remoteInputSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/RemoteInput.yaml#/RemoteInputSettings"
+      $ref: "/doc/swagger/include/RemoteInput.yaml#/RemoteInputSettings"
     sdrPlaySettings:
-      $ref: "http://swgserver:8081/api/swagger/include/SDRPlay.yaml#/SDRPlaySettings"
+      $ref: "/doc/swagger/include/SDRPlay.yaml#/SDRPlaySettings"
     soapySDRInputSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/SoapySDR.yaml#/SoapySDRInputSettings"
+      $ref: "/doc/swagger/include/SoapySDR.yaml#/SoapySDRInputSettings"
     soapySDROutputSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/SoapySDR.yaml#/SoapySDROutputSettings"
+      $ref: "/doc/swagger/include/SoapySDR.yaml#/SoapySDROutputSettings"
     testSourceSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/TestSource.yaml#/TestSourceSettings"
+      $ref: "/doc/swagger/include/TestSource.yaml#/TestSourceSettings"
     xtrxInputSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/Xtrx.yaml#/XtrxInputSettings"
+      $ref: "/doc/swagger/include/Xtrx.yaml#/XtrxInputSettings"
     xtrxOutputSettings:
-      $ref: "http://swgserver:8081/api/swagger/include/Xtrx.yaml#/XtrxOutputSettings"
+      $ref: "/doc/swagger/include/Xtrx.yaml#/XtrxOutputSettings"
diff --git a/sdrbase/resources/webapi/doc/swagger/include/FreeDVMod.yaml b/sdrbase/resources/webapi/doc/swagger/include/FreeDVMod.yaml
index cfa9e8259..0ec6d1c6f 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/FreeDVMod.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/FreeDVMod.yaml
@@ -43,7 +43,7 @@ FreeDVModSettings:
     reverseAPIChannelIndex:
       type: integer
     cwKeyer:
-      $ref: "http://swgserver:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
+      $ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
 
 FreeDVModReport:
   description: FreeDVMod
diff --git a/sdrbase/resources/webapi/doc/swagger/include/FreqTracker.yaml b/sdrbase/resources/webapi/doc/swagger/include/FreqTracker.yaml
index 0462108eb..68a029cd5 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/FreqTracker.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/FreqTracker.yaml
@@ -63,6 +63,9 @@ FreqTrackerReport:
       description: power received in channel (dB)
       type: number
       format: float
+    trackingDeltaFrequency:
+      description: difference between channel and PLL or FLL center frequency (Hz)
+      type: integer
     squelch:
       description: squelch status (1 if open else 0)
       type: integer
diff --git a/sdrbase/resources/webapi/doc/swagger/include/GLScope.yaml b/sdrbase/resources/webapi/doc/swagger/include/GLScope.yaml
index a8dcc7d4b..21ca03bc5 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/GLScope.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/GLScope.yaml
@@ -139,8 +139,8 @@ GLScope:
     tracesData:
       type: array
       items:
-        $ref: "http://swgserver:8081/api/swagger/include/GLScope.yaml#/TraceData"
+        $ref: "/doc/swagger/include/GLScope.yaml#/TraceData"
     triggersData:
       type: array
       items:
-        $ref: "http://swgserver:8081/api/swagger/include/GLScope.yaml#/TriggerData"
+        $ref: "/doc/swagger/include/GLScope.yaml#/TriggerData"
diff --git a/sdrbase/resources/webapi/doc/swagger/include/NFMMod.yaml b/sdrbase/resources/webapi/doc/swagger/include/NFMMod.yaml
index 6fbff54e1..e8bdc6575 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/NFMMod.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/NFMMod.yaml
@@ -50,7 +50,7 @@ NFMModSettings:
     reverseAPIChannelIndex:
       type: integer
     cwKeyer:
-      $ref: "http://swgserver:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
+      $ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
 
 NFMModReport:
   description: NFMMod
diff --git a/sdrbase/resources/webapi/doc/swagger/include/Perseus.yaml b/sdrbase/resources/webapi/doc/swagger/include/Perseus.yaml
index b8dc2ad78..718c3074d 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/Perseus.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/Perseus.yaml
@@ -51,7 +51,7 @@ PerseusReport:
     sampleRates:
       type: array
       items:
-        $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/SampleRate"
+        $ref: "/doc/swagger/include/Structs.yaml#/SampleRate"
 
 PerseusActions:
   description: Perseus
diff --git a/sdrbase/resources/webapi/doc/swagger/include/Preset.yaml b/sdrbase/resources/webapi/doc/swagger/include/Preset.yaml
index 538a5b87e..ffcf4e39c 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/Preset.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/Preset.yaml
@@ -8,7 +8,7 @@ DeviceConfig:
     deviceSequence:
       type: integer
     config:
-      $ref: "http://swgserver:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings"
+      $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings"
 
 ChannelConfig:
   description: Represents a Preset::ChannelConfig object
@@ -17,7 +17,7 @@ ChannelConfig:
       description: Channel type ID in URI form
       type: string
     config:
-      $ref: "http://swgserver:8081/api/swagger/include/ChannelSettings.yaml#/ChannelSettings"
+      $ref: "/doc/swagger/include/ChannelSettings.yaml#/ChannelSettings"
 
 Preset:
   description: Represents a Preset object
@@ -33,7 +33,7 @@ Preset:
       type: integer
       format: int64
     spectrumConfig:
-      $ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum"
+      $ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum"
     dcOffsetCorrection:
       description: boolean
       type: integer
@@ -43,11 +43,11 @@ Preset:
     channelConfigs:
       type: array
       items:
-        $ref: "http://swgserver:8081/api/swagger/include/Preset.yaml#/ChannelConfig"
+        $ref: "/doc/swagger/include/Preset.yaml#/ChannelConfig"
     deviceConfigs:
       type: array
       items:
-        $ref: "http://swgserver:8081/api/swagger/include/Preset.yaml#/DeviceConfig"
+        $ref: "/doc/swagger/include/Preset.yaml#/DeviceConfig"
     layout:
       description: screen and dock layout is a QByteArray handled by Qt::QMainWindow translated to base64
       type: string
diff --git a/sdrbase/resources/webapi/doc/swagger/include/RtlSdr.yaml b/sdrbase/resources/webapi/doc/swagger/include/RtlSdr.yaml
index 5b338ed2c..05485f664 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/RtlSdr.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/RtlSdr.yaml
@@ -57,7 +57,7 @@ RtlSdrReport:
     gains:
       type: array
       items:
-        $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/Gain"
+        $ref: "/doc/swagger/include/Structs.yaml#/Gain"
 
 RtlSdrActions:
   description: RTLSDR
diff --git a/sdrbase/resources/webapi/doc/swagger/include/SDRPlay.yaml b/sdrbase/resources/webapi/doc/swagger/include/SDRPlay.yaml
index ff4f9fd74..84b45fb4e 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/SDRPlay.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/SDRPlay.yaml
@@ -57,19 +57,19 @@ SDRPlayReport:
     sampleRates:
       type: array
       items:
-        $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/SampleRate"
+        $ref: "/doc/swagger/include/Structs.yaml#/SampleRate"
     bandwidths:
       type: array
       items:
-        $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/Bandwidth"
+        $ref: "/doc/swagger/include/Structs.yaml#/Bandwidth"
     intermediateFrequencies:
       type: array
       items:
-        $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/Frequency"
+        $ref: "/doc/swagger/include/Structs.yaml#/Frequency"
     frequencyBands:
       type: array
       items:
-        $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/FrequencyBand"
+        $ref: "/doc/swagger/include/Structs.yaml#/FrequencyBand"
 
 SDRPlayActions:
   description: SDRplay1
diff --git a/sdrbase/resources/webapi/doc/swagger/include/SSBMod.yaml b/sdrbase/resources/webapi/doc/swagger/include/SSBMod.yaml
index 5885edc6f..49de3f04a 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/SSBMod.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/SSBMod.yaml
@@ -55,7 +55,7 @@ SSBModSettings:
     reverseAPIChannelIndex:
       type: integer
     cwKeyer:
-      $ref: "http://swgserver:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
+      $ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
 
 SSBModReport:
   description: SSBMod
diff --git a/sdrbase/resources/webapi/doc/swagger/include/SoapySDR.yaml b/sdrbase/resources/webapi/doc/swagger/include/SoapySDR.yaml
index eaf88b30e..9858dc7a8 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/SoapySDR.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/SoapySDR.yaml
@@ -56,9 +56,9 @@ SoapySDRInputSettings:
       description: boolean not zero for true
       type: integer
     dcCorrection:
-      $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/Complex"
+      $ref: "/doc/swagger/include/Structs.yaml#/Complex"
     iqCorrection:
-      $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/Complex"
+      $ref: "/doc/swagger/include/Structs.yaml#/Complex"
     streamArgSettings:
       type: array
       items:
@@ -119,9 +119,9 @@ SoapySDROutputSettings:
       description: boolean not zero for true
       type: integer
     dcCorrection:
-      $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/Complex"
+      $ref: "/doc/swagger/include/Structs.yaml#/Complex"
     iqCorrection:
-      $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/Complex"
+      $ref: "/doc/swagger/include/Structs.yaml#/Complex"
     streamArgSettings:
       type: array
       items:
@@ -171,7 +171,7 @@ SoapySDRReport:
       description: boolean not zero for true
       type: integer
     gainRange:
-      $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/RangeFloat"
+      $ref: "/doc/swagger/include/Structs.yaml#/RangeFloat"
     gainSettings:
       type: array
       items:
@@ -187,11 +187,11 @@ SoapySDRReport:
     ratesRanges:
       type: array
       items:
-        $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/RangeFloat"
+        $ref: "/doc/swagger/include/Structs.yaml#/RangeFloat"
     bandwidthsRanges:
       type: array
       items:
-        $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/RangeFloat"
+        $ref: "/doc/swagger/include/Structs.yaml#/RangeFloat"
 
 definitions:
 
@@ -201,7 +201,7 @@ definitions:
       name:
         type: string
       range:
-        $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/RangeFloat"
+        $ref: "/doc/swagger/include/Structs.yaml#/RangeFloat"
 
   SoapySDRFrequencySetting:
     description: A named frequency setting specified by a range list
@@ -211,7 +211,7 @@ definitions:
       ranges:
         type: array
         items:
-          $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/RangeFloat"
+          $ref: "/doc/swagger/include/Structs.yaml#/RangeFloat"
 
   ArgValue:
     descripion: Generic argument value
@@ -241,7 +241,7 @@ definitions:
       units:
         type: string
       range:
-        $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/RangeFloat"
+        $ref: "/doc/swagger/include/Structs.yaml#/RangeFloat"
       valueOptions:
         type: array
         items:
diff --git a/sdrbase/resources/webapi/doc/swagger/include/WFMMod.yaml b/sdrbase/resources/webapi/doc/swagger/include/WFMMod.yaml
index 8d5d4b64f..d87997db8 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/WFMMod.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/WFMMod.yaml
@@ -46,7 +46,7 @@ WFMModSettings:
     reverseAPIChannelIndex:
       type: integer
     cwKeyer:
-      $ref: "http://swgserver:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
+      $ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
 
 WFMModReport:
   description: WFMMod
diff --git a/sdrbase/resources/webapi/doc/swagger/swagger.yaml b/sdrbase/resources/webapi/doc/swagger/swagger.yaml
index 0a90fb5eb..2214d0edd 100644
--- a/sdrbase/resources/webapi/doc/swagger/swagger.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/swagger.yaml
@@ -565,7 +565,7 @@ paths:
         "200":
           description: On success return configuration information for the given device in input
           schema:
-            $ref: "http://swgserver:8081/api/swagger/include/LimeRFE.yaml#/LimeRFESettings"
+            $ref: "/doc/swagger/include/LimeRFE.yaml#/LimeRFESettings"
         "500":
           $ref: "#/responses/Response_500"
         "501":
@@ -583,7 +583,7 @@ paths:
           description: Give device serial path in devicePath field. To switch Rx and/or Tx on or off use the run API.
           required: true
           schema:
-            $ref: "http://swgserver:8081/api/swagger/include/LimeRFE.yaml#/LimeRFESettings"
+            $ref: "/doc/swagger/include/LimeRFE.yaml#/LimeRFESettings"
       responses:
         "200":
           description: Success
@@ -611,7 +611,7 @@ paths:
           description: Give device serial path in devicePath field and run status in rxOn and txOn
           required: true
           schema:
-            $ref: "http://swgserver:8081/api/swagger/include/LimeRFE.yaml#/LimeRFESettings"
+            $ref: "/doc/swagger/include/LimeRFE.yaml#/LimeRFESettings"
       responses:
         "200":
           description: Success
@@ -643,7 +643,7 @@ paths:
         "200":
           description: On success return forward and reflected powers in centi-Bels
           schema:
-            $ref: "http://swgserver:8081/api/swagger/include/LimeRFE.yaml#/LimeRFEPower"
+            $ref: "/doc/swagger/include/LimeRFE.yaml#/LimeRFEPower"
         "400":
           description: Error
           schema:
@@ -1036,7 +1036,7 @@ paths:
         "200":
           description: On success returns current settings values
           schema:
-            $ref: "http://swgserver:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings"
+            $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings"
         "404":
           description: Invalid device set index or device not found
           schema:
@@ -1061,12 +1061,12 @@ paths:
           description: Device settings to apply
           required: true
           schema:
-            $ref: "http://swgserver:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings"
+            $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings"
       responses:
         "200":
           description: On success returns new settings values
           schema:
-            $ref: "http://swgserver:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings"
+            $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings"
         "404":
           description: Invalid device set index or device not found
           schema:
@@ -1091,12 +1091,12 @@ paths:
           description: Device settings to apply
           required: true
           schema:
-            $ref: "http://swgserver:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings"
+            $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings"
       responses:
         "200":
           description: On success returns new settings values
           schema:
-            $ref: "http://swgserver:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings"
+            $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings"
         "404":
           description: Invalid device set index or device not found
           schema:
@@ -1152,7 +1152,7 @@ paths:
           description: Originator information in the reverse API case
           required: false
           schema:
-            $ref: "http://swgserver:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings"
+            $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings"
       responses:
         "200":
           description: On success return state before change
@@ -1186,7 +1186,7 @@ paths:
           description: Originator information in the reverse API case
           required: false
           schema:
-            $ref: "http://swgserver:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings"
+            $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings"
       responses:
         "200":
           description: On success return state before change
@@ -1261,7 +1261,7 @@ paths:
           description: Originator information in the reverse API case
           required: false
           schema:
-            $ref: "http://swgserver:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings"
+            $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings"
       responses:
         "200":
           description: On success return state before change
@@ -1300,7 +1300,7 @@ paths:
           description: Originator information in the reverse API case
           required: false
           schema:
-            $ref: "http://swgserver:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings"
+            $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings"
       responses:
         "200":
           description: On success return state before change
@@ -1400,7 +1400,7 @@ paths:
           description: Action(s) to apply to the device
           required: true
           schema:
-            $ref: "http://swgserver:8081/api/swagger/include/DeviceActions.yaml#/DeviceActions"
+            $ref: "/doc/swagger/include/DeviceActions.yaml#/DeviceActions"
       responses:
         "202":
           description: Message to perform action was sent successfully
@@ -1437,7 +1437,7 @@ paths:
           description: Channel identification (no settings data)
           required: true
           schema:
-            $ref: "http://swgserver:8081/api/swagger/include/ChannelSettings.yaml#/ChannelSettings"
+            $ref: "/doc/swagger/include/ChannelSettings.yaml#/ChannelSettings"
       responses:
         "202":
           description: Message to add a channel was sent successfully
@@ -1477,7 +1477,7 @@ paths:
         "200":
           description: On success return deleted channel settings
           schema:
-            $ref: "http://swgserver:8081/api/swagger/include/ChannelSettings.yaml#/ChannelSettings"
+            $ref: "/doc/swagger/include/ChannelSettings.yaml#/ChannelSettings"
         "400":
           description: Invalid device set or channel index
           schema:
@@ -1513,7 +1513,7 @@ paths:
         "200":
           description: On success return channel settings
           schema:
-            $ref: "http://swgserver:8081/api/swagger/include/ChannelSettings.yaml#/ChannelSettings"
+            $ref: "/doc/swagger/include/ChannelSettings.yaml#/ChannelSettings"
         "400":
           description: Invalid device set or channel index
           schema:
@@ -1547,12 +1547,12 @@ paths:
           description: Channel settings to apply
           required: true
           schema:
-            $ref: "http://swgserver:8081/api/swagger/include/ChannelSettings.yaml#/ChannelSettings"
+            $ref: "/doc/swagger/include/ChannelSettings.yaml#/ChannelSettings"
       responses:
         "200":
           description: On success return channel new settings
           schema:
-            $ref: "http://swgserver:8081/api/swagger/include/ChannelSettings.yaml#/ChannelSettings"
+            $ref: "/doc/swagger/include/ChannelSettings.yaml#/ChannelSettings"
         "400":
           description: Invalid device set or channel index
           schema:
@@ -1586,12 +1586,12 @@ paths:
           description: Channel settings to apply
           required: true
           schema:
-            $ref: "http://swgserver:8081/api/swagger/include/ChannelSettings.yaml#/ChannelSettings"
+            $ref: "/doc/swagger/include/ChannelSettings.yaml#/ChannelSettings"
       responses:
         "200":
           description: On success return channel new settings
           schema:
-            $ref: "http://swgserver:8081/api/swagger/include/ChannelSettings.yaml#/ChannelSettings"
+            $ref: "/doc/swagger/include/ChannelSettings.yaml#/ChannelSettings"
         "400":
           description: Invalid device set or channel index
           schema:
@@ -1664,7 +1664,7 @@ paths:
           description: Action(s) to apply to the channel
           required: true
           schema:
-            $ref: "http://swgserver:8081/api/swagger/include/ChannelActions.yaml#/ChannelActions"
+            $ref: "/doc/swagger/include/ChannelActions.yaml#/ChannelActions"
       responses:
         "202":
           description: Message to perform action was sent successfully
@@ -1735,17 +1735,17 @@ definitions:
     description: Preferences, Presets and Commands of the MainSettings saved by Qt
     properties:
       preferences:
-        $ref: "http://swgserver:8081/api/swagger/include/Preferences.yaml#/Preferences"
+        $ref: "/doc/swagger/include/Preferences.yaml#/Preferences"
       workingPreset:
-        $ref: "http://swgserver:8081/api/swagger/include/Preset.yaml#/Preset"
+        $ref: "/doc/swagger/include/Preset.yaml#/Preset"
       presets:
         type: array
         items:
-          $ref: "http://swgserver:8081/api/swagger/include/Preset.yaml#/Preset"
+          $ref: "/doc/swagger/include/Preset.yaml#/Preset"
       commands:
         type: array
         items:
-          $ref: "http://swgserver:8081/api/swagger/include/Command.yaml#/Command"
+          $ref: "/doc/swagger/include/Command.yaml#/Command"
 
   InstanceDevicesResponse:
     description: "Summarized information about logical devices from hardware devices attached to this SDRangel instance"
@@ -2280,47 +2280,47 @@ definitions:
         description: 0 for Rx only, 1 for Tx only or 2 for any number and direction (default 0)
         type: integer
       airspyReport:
-        $ref: "http://swgserver:8081/api/swagger/include/Airspy.yaml#/AirspyReport"
+        $ref: "/doc/swagger/include/Airspy.yaml#/AirspyReport"
       airspyHFReport:
-        $ref: "http://swgserver:8081/api/swagger/include/AirspyHF.yaml#/AirspyHFReport"
+        $ref: "/doc/swagger/include/AirspyHF.yaml#/AirspyHFReport"
       bladeRF2InputReport:
-        $ref: "http://swgserver:8081/api/swagger/include/BladeRF2.yaml#/BladeRF2InputReport"
+        $ref: "/doc/swagger/include/BladeRF2.yaml#/BladeRF2InputReport"
       bladeRF2OutputReport:
-        $ref: "http://swgserver:8081/api/swagger/include/BladeRF2.yaml#/BladeRF2OutputReport"
+        $ref: "/doc/swagger/include/BladeRF2.yaml#/BladeRF2OutputReport"
       fileInputReport:
-        $ref: "http://swgserver:8081/api/swagger/include/FileInput.yaml#/FileInputReport"
+        $ref: "/doc/swagger/include/FileInput.yaml#/FileInputReport"
       limeSdrInputReport:
-        $ref: "http://swgserver:8081/api/swagger/include/LimeSdr.yaml#/LimeSdrInputReport"
+        $ref: "/doc/swagger/include/LimeSdr.yaml#/LimeSdrInputReport"
       kiwiSDRReport:
-        $ref: "http://swgserver:8081/api/swagger/include/KiwiSDR.yaml#/KiwiSDRReport"
+        $ref: "/doc/swagger/include/KiwiSDR.yaml#/KiwiSDRReport"
       limeSdrOutputReport:
-        $ref: "http://swgserver:8081/api/swagger/include/LimeSdr.yaml#/LimeSdrOutputReport"
+        $ref: "/doc/swagger/include/LimeSdr.yaml#/LimeSdrOutputReport"
       localInputReport:
-        $ref: "http://swgserver:8081/api/swagger/include/LocalInput.yaml#/LocalInputReport"
+        $ref: "/doc/swagger/include/LocalInput.yaml#/LocalInputReport"
       localOutputReport:
-        $ref: "http://swgserver:8081/api/swagger/include/LocalOutput.yaml#/LocalOutputReport"
+        $ref: "/doc/swagger/include/LocalOutput.yaml#/LocalOutputReport"
       perseusReport:
-        $ref: "http://swgserver:8081/api/swagger/include/Perseus.yaml#/PerseusReport"
+        $ref: "/doc/swagger/include/Perseus.yaml#/PerseusReport"
       plutoSdrInputReport:
-        $ref: "http://swgserver:8081/api/swagger/include/PlutoSdr.yaml#/PlutoSdrInputReport"
+        $ref: "/doc/swagger/include/PlutoSdr.yaml#/PlutoSdrInputReport"
       plutoSdrOutputReport:
-        $ref: "http://swgserver:8081/api/swagger/include/PlutoSdr.yaml#/PlutoSdrOutputReport"
+        $ref: "/doc/swagger/include/PlutoSdr.yaml#/PlutoSdrOutputReport"
       rtlSdrReport:
-        $ref: "http://swgserver:8081/api/swagger/include/RtlSdr.yaml#/RtlSdrReport"
+        $ref: "/doc/swagger/include/RtlSdr.yaml#/RtlSdrReport"
       remoteOutputReport:
-        $ref: "http://swgserver:8081/api/swagger/include/RemoteOutput.yaml#/RemoteOutputReport"
+        $ref: "/doc/swagger/include/RemoteOutput.yaml#/RemoteOutputReport"
       remoteInputReport:
-        $ref: "http://swgserver:8081/api/swagger/include/RemoteInput.yaml#/RemoteInputReport"
+        $ref: "/doc/swagger/include/RemoteInput.yaml#/RemoteInputReport"
       sdrPlayReport:
-        $ref: "http://swgserver:8081/api/swagger/include/SDRPlay.yaml#/SDRPlayReport"
+        $ref: "/doc/swagger/include/SDRPlay.yaml#/SDRPlayReport"
       soapySDRInputReport:
-        $ref: "http://swgserver:8081/api/swagger/include/SoapySDR.yaml#/SoapySDRReport"
+        $ref: "/doc/swagger/include/SoapySDR.yaml#/SoapySDRReport"
       soapySDROutputReport:
-        $ref: "http://swgserver:8081/api/swagger/include/SoapySDR.yaml#/SoapySDRReport"
+        $ref: "/doc/swagger/include/SoapySDR.yaml#/SoapySDRReport"
       xtrxInputReport:
-        $ref: "http://swgserver:8081/api/swagger/include/Xtrx.yaml#/XtrxInputReport"
+        $ref: "/doc/swagger/include/Xtrx.yaml#/XtrxInputReport"
       xtrxOutputReport:
-        $ref: "http://swgserver:8081/api/swagger/include/Xtrx.yaml#/XtrxOutputReport"
+        $ref: "/doc/swagger/include/Xtrx.yaml#/XtrxOutputReport"
 
   ChannelReport:
     description: Base channel report. Only the channel report corresponding to the channel specified in the channelType field is or should be present.
@@ -2333,41 +2333,41 @@ definitions:
         description: 0 for Rx only, 1 for Tx only or 2 for any number and direction (default 0)
         type: integer
       AMDemodReport:
-        $ref: "http://swgserver:8081/api/swagger/include/AMDemod.yaml#/AMDemodReport"
+        $ref: "/doc/swagger/include/AMDemod.yaml#/AMDemodReport"
       AMModReport:
-        $ref: "http://swgserver:8081/api/swagger/include/AMMod.yaml#/AMModReport"
+        $ref: "/doc/swagger/include/AMMod.yaml#/AMModReport"
       ATVModReport:
-        $ref: "http://swgserver:8081/api/swagger/include/ATVMod.yaml#/ATVModReport"
+        $ref: "/doc/swagger/include/ATVMod.yaml#/ATVModReport"
       BFMDemodReport:
-        $ref: "http://swgserver:8081/api/swagger/include/BFMDemod.yaml#/BFMDemodReport"
+        $ref: "/doc/swagger/include/BFMDemod.yaml#/BFMDemodReport"
       DSDDemodReport:
-        $ref: "http://swgserver:8081/api/swagger/include/DSDDemod.yaml#/DSDDemodReport"
+        $ref: "/doc/swagger/include/DSDDemod.yaml#/DSDDemodReport"
       FileSourceReport:
-        $ref: "http://swgserver:8081/api/swagger/include/FileSource.yaml#/FileSourceReport"
+        $ref: "/doc/swagger/include/FileSource.yaml#/FileSourceReport"
       FreeDVDemodReport:
-        $ref: "http://swgserver:8081/api/swagger/include/FreeDVDemod.yaml#/FreeDVDemodReport"
+        $ref: "/doc/swagger/include/FreeDVDemod.yaml#/FreeDVDemodReport"
       FreeDVModReport:
-        $ref: "http://swgserver:8081/api/swagger/include/FreeDVMod.yaml#/FreeDVModReport"
+        $ref: "/doc/swagger/include/FreeDVMod.yaml#/FreeDVModReport"
       FreqTrackerReport:
-        $ref: "http://swgserver:8081/api/swagger/include/FreqTracker.yaml#/FreqTrackerReport"
+        $ref: "/doc/swagger/include/FreqTracker.yaml#/FreqTrackerReport"
       NFMDemodReport:
-        $ref: "http://swgserver:8081/api/swagger/include/NFMDemod.yaml#/NFMDemodReport"
+        $ref: "/doc/swagger/include/NFMDemod.yaml#/NFMDemodReport"
       NFMModReport:
-        $ref: "http://swgserver:8081/api/swagger/include/NFMMod.yaml#/NFMModReport"
+        $ref: "/doc/swagger/include/NFMMod.yaml#/NFMModReport"
       SSBDemodReport:
-        $ref: "http://swgserver:8081/api/swagger/include/SSBDemod.yaml#/SSBDemodReport"
+        $ref: "/doc/swagger/include/SSBDemod.yaml#/SSBDemodReport"
       RemoteSourceReport:
-        $ref: "http://swgserver:8081/api/swagger/include/RemoteSource.yaml#/RemoteSourceReport"
+        $ref: "/doc/swagger/include/RemoteSource.yaml#/RemoteSourceReport"
       SSBModReport:
-        $ref: "http://swgserver:8081/api/swagger/include/SSBMod.yaml#/SSBModReport"
+        $ref: "/doc/swagger/include/SSBMod.yaml#/SSBModReport"
       UDPSourceReport:
-        $ref: "http://swgserver:8081/api/swagger/include/UDPSource.yaml#/UDPSourceReport"
+        $ref: "/doc/swagger/include/UDPSource.yaml#/UDPSourceReport"
       UDPSinkReport:
-        $ref: "http://swgserver:8081/api/swagger/include/UDPSink.yaml#/UDPSinkReport"
+        $ref: "/doc/swagger/include/UDPSink.yaml#/UDPSinkReport"
       WFMDemodReport:
-        $ref: "http://swgserver:8081/api/swagger/include/WFMDemod.yaml#/WFMDemodReport"
+        $ref: "/doc/swagger/include/WFMDemod.yaml#/WFMDemodReport"
       WFMModReport:
-        $ref: "http://swgserver:8081/api/swagger/include/WFMMod.yaml#/WFMModReport"
+        $ref: "/doc/swagger/include/WFMMod.yaml#/WFMModReport"
 
 responses:
 
diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html
index 446506ad2..fb7f75bbf 100644
--- a/swagger/sdrangel/code/html2/index.html
+++ b/swagger/sdrangel/code/html2/index.html
@@ -3582,6 +3582,10 @@ margin-bottom: 20px;
       "format" : "float",
       "description" : "power received in channel (dB)"
     },
+    "trackingDeltaFrequency" : {
+      "type" : "integer",
+      "description" : "difference between channel and PLL or FLL center frequency (Hz)"
+    },
     "squelch" : {
       "type" : "integer",
       "description" : "squelch status (1 if open else 0)"
@@ -33455,7 +33459,7 @@ except ApiException as e:
           </div>
           <div id="generator">
             <div class="content">
-              Generated 2020-06-23T19:48:55.770+02:00
+              Generated 2020-06-27T10:29:00.151+02:00
             </div>
           </div>
       </div>
diff --git a/swagger/sdrangel/code/qt5/client/SWGFreqTrackerReport.cpp b/swagger/sdrangel/code/qt5/client/SWGFreqTrackerReport.cpp
index 6caa2433b..32aef36dd 100644
--- a/swagger/sdrangel/code/qt5/client/SWGFreqTrackerReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGFreqTrackerReport.cpp
@@ -30,6 +30,8 @@ SWGFreqTrackerReport::SWGFreqTrackerReport(QString* json) {
 SWGFreqTrackerReport::SWGFreqTrackerReport() {
     channel_power_db = 0.0f;
     m_channel_power_db_isSet = false;
+    tracking_delta_frequency = 0;
+    m_tracking_delta_frequency_isSet = false;
     squelch = 0;
     m_squelch_isSet = false;
     sample_rate = 0;
@@ -46,6 +48,8 @@ void
 SWGFreqTrackerReport::init() {
     channel_power_db = 0.0f;
     m_channel_power_db_isSet = false;
+    tracking_delta_frequency = 0;
+    m_tracking_delta_frequency_isSet = false;
     squelch = 0;
     m_squelch_isSet = false;
     sample_rate = 0;
@@ -60,6 +64,7 @@ SWGFreqTrackerReport::cleanup() {
 
 
 
+
 }
 
 SWGFreqTrackerReport*
@@ -75,6 +80,8 @@ void
 SWGFreqTrackerReport::fromJsonObject(QJsonObject &pJson) {
     ::SWGSDRangel::setValue(&channel_power_db, pJson["channelPowerDB"], "float", "");
     
+    ::SWGSDRangel::setValue(&tracking_delta_frequency, pJson["trackingDeltaFrequency"], "qint32", "");
+    
     ::SWGSDRangel::setValue(&squelch, pJson["squelch"], "qint32", "");
     
     ::SWGSDRangel::setValue(&sample_rate, pJson["sampleRate"], "qint32", "");
@@ -100,6 +107,9 @@ SWGFreqTrackerReport::asJsonObject() {
     if(m_channel_power_db_isSet){
         obj->insert("channelPowerDB", QJsonValue(channel_power_db));
     }
+    if(m_tracking_delta_frequency_isSet){
+        obj->insert("trackingDeltaFrequency", QJsonValue(tracking_delta_frequency));
+    }
     if(m_squelch_isSet){
         obj->insert("squelch", QJsonValue(squelch));
     }
@@ -123,6 +133,16 @@ SWGFreqTrackerReport::setChannelPowerDb(float channel_power_db) {
     this->m_channel_power_db_isSet = true;
 }
 
+qint32
+SWGFreqTrackerReport::getTrackingDeltaFrequency() {
+    return tracking_delta_frequency;
+}
+void
+SWGFreqTrackerReport::setTrackingDeltaFrequency(qint32 tracking_delta_frequency) {
+    this->tracking_delta_frequency = tracking_delta_frequency;
+    this->m_tracking_delta_frequency_isSet = true;
+}
+
 qint32
 SWGFreqTrackerReport::getSquelch() {
     return squelch;
@@ -161,6 +181,9 @@ SWGFreqTrackerReport::isSet(){
         if(m_channel_power_db_isSet){
             isObjectUpdated = true; break;
         }
+        if(m_tracking_delta_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
         if(m_squelch_isSet){
             isObjectUpdated = true; break;
         }
diff --git a/swagger/sdrangel/code/qt5/client/SWGFreqTrackerReport.h b/swagger/sdrangel/code/qt5/client/SWGFreqTrackerReport.h
index c84057d80..857915fd4 100644
--- a/swagger/sdrangel/code/qt5/client/SWGFreqTrackerReport.h
+++ b/swagger/sdrangel/code/qt5/client/SWGFreqTrackerReport.h
@@ -44,6 +44,9 @@ public:
     float getChannelPowerDb();
     void setChannelPowerDb(float channel_power_db);
 
+    qint32 getTrackingDeltaFrequency();
+    void setTrackingDeltaFrequency(qint32 tracking_delta_frequency);
+
     qint32 getSquelch();
     void setSquelch(qint32 squelch);
 
@@ -60,6 +63,9 @@ private:
     float channel_power_db;
     bool m_channel_power_db_isSet;
 
+    qint32 tracking_delta_frequency;
+    bool m_tracking_delta_frequency_isSet;
+
     qint32 squelch;
     bool m_squelch_isSet;