diff --git a/matlab/TCV/gdat_tcv.m b/matlab/TCV/gdat_tcv.m
index 0b760d6a7a470cfe84d295bd737ba4b171e87a30..b2a647ea349bfd8e78ba00f314713e91dfb7fd93 100644
--- a/matlab/TCV/gdat_tcv.m
+++ b/matlab/TCV/gdat_tcv.m
@@ -1,4 +1,4 @@
-function [gdat_data,gdat_params,error_status,varargout] = gdat_tcv_OS(shot,data_request,varargin)
+function [gdat_data,gdat_params,error_status,varargout] = gdat_tcv(shot,data_request,varargin)
 %
 % function [gdat_data,gdat_params,error_status,varargout] = gdat(shot,data_request,varargin)
 %
@@ -2574,8 +2574,8 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
     end
 
     if any(strmatch('dnbi',gdat_data.gdat_params.source))
-    % NB2
-    nodenameeff = '\RESULTS::DNBI:POWR_TCV';
+      % NB2
+      nodenameeff = '\RESULTS::DNBI:POWR_TCV';
       nb2_data_tdi = tdi(nodenameeff);
       if ~isempty(nb2_data_tdi.data) && ~ischar(nb2_data_tdi.data) && ~isempty(nb2_data_tdi.dim)
         nbi_neutral_power_tot = nb2_data_tdi.data.*1e6; % in W
@@ -2706,7 +2706,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
     end
    case {'phi_tor', 'phitor', 'toroidal_flux'}
     % Phi(LCFS) = int(Bphi dSphi), can use Eq.(11) of "Tokamak coordinate conventions: COCOS" paper:
-    % O. Sauter, S.Yu. Medvedev, Comput. Phys. Commun. 184 (2013) 293–302
+    % O. Sauter, S.Yu. Medvedev, Comput. Phys. Commun. 184 (2013) 293???302
     % since cocos=17 for LIUQE we get:
     % q = -dPhi/dpsi => Phi = - int(q*dpsi) which should always have the sign of B0
     % need to get q_rho but to avoid loop for rhotor in grids_1d, get q_rho explicitely here
@@ -2928,7 +2928,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
     %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    case {'rhotor_edge', 'rhotor', 'rhotor_norm'}
     % Phi(LCFS) = int(Bphi dSphi), can use Eq.(11) of "Tokamak coordinate conventions: COCOS" paper:
-    % O. Sauter, S.Yu. Medvedev, Comput. Phys. Commun. 184 (2013) 293–302
+    % O. Sauter, S.Yu. Medvedev, Comput. Phys. Commun. 184 (2013) 293???302
     % since cocos=17 for LIUQE we get:
     % q = -dPhi/dpsi => Phi = - int(q*dpsi) which should always have the sign of B0
     % need to get q_rho but to avoid loop for rhotor in grids_1d, get q_rho explicitely here
@@ -3315,7 +3315,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
         gdat_data.x = [1:size(sig,1)];
         gdat_data.dimunits = {'20 chords per camera'; 's'};
       else
-        % keyboard
+        keyboard
         % extract only given channels
         gdat_data.data = sig(channel_xtomo,:);
         gdat_data.x = channel_xtomo;