diff --git a/matlab/JET/gdat_jet.m b/matlab/JET/gdat_jet.m
index c38adeed9ba2b35f9be33392df5002b2f5ad68c2..dff583deaa4786b180f2edbc777ddb091efc6e02 100644
--- a/matlab/JET/gdat_jet.m
+++ b/matlab/JET/gdat_jet.m
@@ -1370,7 +1370,7 @@ elseif strcmp(mapping_for_jet.method,'switchcase')
     gdat_data.dimunits{1} = 's';
     gdat_data.data = rad.data;
     gdat_data.units = 'W';
-    gdat_data.data_fullpath = params_eff.data_request;
+    gdat_data.data_fullpath = rad.gdat_params.data_request;
 
     %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    case {'psi_edge'}
diff --git a/matlab/TCV/gdat_tcv.m b/matlab/TCV/gdat_tcv.m
index 76332c00187d360270dd05db09ebfb17716b57a6..56d436ce8f5e95f0e72dac0763d3cb3aca775138 100644
--- a/matlab/TCV/gdat_tcv.m
+++ b/matlab/TCV/gdat_tcv.m
@@ -1780,10 +1780,16 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
       switch gdat_data.gdat_params.fit_type
        case 'avg'
         def_proffit = '\results::proffit.avg_time:';
+        def_rhotornorm = '\results::proffit:rhotor';
+        def_rhovolnorm = '\results::proffit:rhovol';
        case 'local'
         def_proffit = '\results::proffit.local_time:';
+        def_rhotornorm = '\results::proffit:rhotor';
+        def_rhovolnorm = '\results::proffit:rhovol';
        case 'conf'
         def_proffit = '\results::conf:';
+        def_rhotornorm = '\results::conf:rhotor';
+        def_rhovolnorm = '\results::conf:rhovol';
        otherwise
         if (gdat_params.nverbose>=1);
           disp('should not be in switch gdat_data.gdat_params.fit_type')
@@ -1852,13 +1858,24 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
         gdat_data.fit.units=tracetdi.units;
       end
       gdat_data.fit.data_fullpath = nodenameeff;
+      gdat_data.fit.help = '.x is rhopol coordinate';
+      tmp = tdi(def_rhotornorm);
+      gdat_data.fit.rhotornorm = tmp.data;
+      tmp = tdi(def_rhovolnorm);
+      gdat_data.fit.rhovolnorm = tmp.data;
       % do te as well if nete asked for
       if strcmp(data_request_eff(1:4),'nete')
-        gdat_data.fit.ne.data = gdat_data.fit.data;
-        gdat_data.fit.ne.x = gdat_data.fit.x;
-        gdat_data.fit.ne.t = gdat_data.fit.t;
-        gdat_data.fit.ne.units = gdat_data.fit.units;
-        gdat_data.fit.ne.data_fullpath = gdat_data.fit.data_fullpath;
+        for subfields={'data','x','t','units','help','rhotornorm','rhovolnorm','data_fullpath'}
+          gdat_data.fit.ne.(subfields{1}) = gdat_data.fit.(subfields{1});
+        end
+% $$$         gdat_data.fit.ne.data = gdat_data.fit.data;
+% $$$         gdat_data.fit.ne.x = gdat_data.fit.x;
+% $$$         gdat_data.fit.ne.t = gdat_data.fit.t;
+% $$$         gdat_data.fit.ne.units = gdat_data.fit.units;
+% $$$         gdat_data.fit.ne.data_fullpath = gdat_data.fit.data_fullpath;
+% $$$         gdat_data.fit.ne.help = gdat_data.fit.help;
+% $$$         gdat_data.fit.ne.rhotornorm = gdat_data.fit.rhotornorm;
+% $$$         gdat_data.fit.ne.rhovolnorm = gdat_data.fit.rhovolnorm;
         if strcmp(gdat_data.gdat_params.fit_type,'conf')
           nodenameeff = [def_proffit 'te'];
         else
@@ -1875,8 +1892,11 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
             return
           end
         end
-        gdat_data.fit.te.x = gdat_data.fit.ne.x;
-        gdat_data.fit.te.t = gdat_data.fit.ne.t;
+        for subfields={'x','t','help','rhotornorm','rhovolnorm'}
+          gdat_data.fit.te.(subfields{1}) = gdat_data.fit.ne.(subfields{1});
+        end
+% $$$         gdat_data.fit.te.x = gdat_data.fit.ne.x;
+% $$$         gdat_data.fit.te.t = gdat_data.fit.ne.t;
         if any(strcmp(fieldnames(tracetdi),'units'))
           gdat_data.fit.te.units=tracetdi.units;
         end
@@ -1983,6 +2003,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
       if isempty(tracetdi.data) || isempty(tracetdi.dim) || ischar(tracetdi.data)
         if (gdat_params.nverbose>=1); warning(['problems loading data for ' nodenameeff ' for data_request= ' data_request_eff]); end
       else
+        ij=[~isfinite(tracetdi.data)]; tracetdi.data(ij)=0.;
         gdat_data.ec.data = tracetdi.data*1e3; % at this stage p_gyro is in kW'
         gdat_data.ec.units = 'W';
         gdat_data.ec.dim=tracetdi.dim;
@@ -2021,7 +2042,8 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
         nbh_data_tdi = tdi(nodenameeff);
         if ~isempty(nbh_data_tdi.data) && ~ischar(nbh_data_tdi.data) && ~isempty(nbh_data_tdi.dim)
           nbi_neutral_power_tot = nbh_data_tdi.data.*1e6; % in W
-          nbi_neutral_power_tot = max(nbi_neutral_power_tot,0.);
+          ij = nbi_neutral_power_tot<100;
+          nbi_neutral_power_tot(ij) = 0.;
           gdat_data.nbi.data = nbi_neutral_power_tot; % at this stage p_gyro is in kW'
           gdat_data.nbi.units = 'W';
           gdat_data.nbi.dim{1}=nbh_data_tdi.dim{1};