diff --git a/pub/src/expr.cpp b/pub/src/expr.cpp
index 1aed95e772e0c2bb1ff3ade26c0c09fa3d59af59..845adc70224c68526eed856bf81962422620f7aa 100644
--- a/pub/src/expr.cpp
+++ b/pub/src/expr.cpp
@@ -894,29 +894,25 @@ void CTree::tree_vec_val(
 
 void CTree::setConv( uint& kconv, uint& jconv, uint k, uint j )
 {
-    // set and check kconv:
+    // set kconv for given k:
     if ( k >= NOlm::MOM.size() )
-        throw string( "BUG: setConv called with invalid k" );
+        throw "BUG: setConv called with invalid k";
     POlc fc = P2C( NOlm::MOM[k] );
     if( !fc )
-        throw string( "k refers to data, curve expected" );
+        throw "k refers to data, curve expected";
     kconv = fc->kconv;
-
-    if( kconv==(uint)-1 ){
-        jconv = -1;
+    if( kconv==(uint)-1 ) { // no convolution
+        jconv = -1; // should not be needed
         return;
     } else if ( kconv >= NOlm::MOM.size() )
-        throw string( "invalid convolution file index " ) + strg(kconv);
-
+        throw "invalid convolution file index " + strg(kconv);
     POld fconv = P2D( NOlm::MOM[kconv] );
     if( !fconv )
-        throw string( "cannot convolute with curve" );
+        throw "cannot convolute with curve";
 
-    // set and check jconv:
+    // set jconv for given j:
     if ( j>=fc->nJ() )
-        throw string( "BUG: setConv called with invalid j" );
-
-    // set jconv:
+        throw "BUG: setConv called with invalid j";
     if      ( fconv->nJ()==1 )       // nJ:1  correspondence
         jconv = 0;
     else if ( fconv->nJ()==fc->nJ() ) // nJ:nJ correspondence
diff --git a/pub/src/func.cpp b/pub/src/func.cpp
index 0998c33db59a8f931bc5a0871771071a091450e1..e4afa9973cc61575a63eac274972480fda783c16 100644
--- a/pub/src/func.cpp
+++ b/pub/src/func.cpp
@@ -155,7 +155,7 @@ double func_kwwc( double v, double a ){
 double func_kwws( double v, double a ){
     if( a<0.1 || a>2.0 ) return 0;
     return kwwsf( (float)v, (float)a ); }
-double func_skww( double w, double _b, double _wc ){
+double func_kwwc_cut( double w, double _b, double _wc ){
     // KWW S(q,w) with round-off at wc
     static double b=0, wc=0, sig2=0, amp=0;
     if( _b<0.1 || _b>2.0 || _wc<=0 ) return 0;
@@ -453,7 +453,7 @@ void NFunctions::initialize(void) {
         "(x,y,z): ?" ).register_me();
     CFunc( "cauchy2",  func_cauchy2, 0, 0,
         "(x,y,z): ?" ).register_me();
-    CFunc( "skww",     func_skww, 0, 0,
+    CFunc( "kwwc_cut", func_kwwc_cut, 0, 0,
         "(x,y,z): ?" ).register_me();
     CFunc( "rehavneg", func_re_havneg, 0, 0,
         "(x,y,z): real part of the Havriliak-Negami function"