diff --git a/libsrc/arith.cc b/libsrc/arith.cc
index 3b819d7..78458ed 100644
--- a/libsrc/arith.cc
+++ b/libsrc/arith.cc
@@ -192,7 +192,7 @@ vector<long> posdivs(long a, const vector<long>& plist)
 {
 // cout << "In posdivs with a = " << a << endl;
 // cout << plist.size() << " primes: " <<endl; cout << plist << endl;
- long j,k,p,e,nd = 1;
+ long j,k,e,nd = 1;
  vector<long> dlist(1,1);  // cout << "Divisor 0 = 1" << endl;
  for (const auto& p : plist)
    {
@@ -209,7 +209,7 @@ vector<long> posdivs(long a, const vector<long>& plist)
 vector<long> alldivs(long a, const vector<long>& plist)
 {//cout << "In alldivs with a = " << a << endl;
 // cout << plist.size() << " primes: " <<endl; cout << plist << endl;
- long j,k,p,e,nd = 2;
+ long j,k,e,nd = 2;
  vector<long> dlist(1,1);  // cout << "Divisor 0 =  1" << endl;
  dlist.push_back(-1);      // cout << "Divisor 1 = -1" << endl;
  for (const auto& p : plist)
@@ -226,7 +226,7 @@ vector<long> alldivs(long a, const vector<long>& plist)
 
 vector<long> sqdivs(long a, const vector<long>& plist)
 {
- long j,k,p,e,nd = 1;
+ long j,k,e,nd = 1;
  vector<long> dlist(1,1);
  for (const auto& p : plist)
    {
@@ -242,7 +242,7 @@ vector<long> sqdivs(long a, const vector<long>& plist)
 
 vector<long> sqfreedivs(long a, const vector<long>& plist)
 {
- long j,k,p,e,nd = 1;
+ long j,k,e,nd = 1;
  vector<long> dlist(1,1);
  for (const auto& p : plist)
  {
diff --git a/libsrc/curvered.cc b/libsrc/curvered.cc
index dafbfbc..e9a6257 100644
--- a/libsrc/curvered.cc
+++ b/libsrc/curvered.cc
@@ -2,25 +2,25 @@
 //////////////////////////////////////////////////////////////////////////
 //
 // Copyright 1990-2023 John Cremona
-// 
+//
 // This file is part of the eclib package.
-// 
+//
 // eclib is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the
 // Free Software Foundation; either version 2 of the License, or (at your
 // option) any later version.
-// 
+//
 // eclib is distributed in the hope that it will be useful, but WITHOUT
 // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 // FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 // for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with eclib; if not, write to the Free Software Foundation,
 // Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-// 
+//
 //////////////////////////////////////////////////////////////////////////
- 
+
 #include <eclib/curve.h>
 #include <eclib/polys.h> // for nrootscubic
 #include <eclib/curvemod.h> // for point counting to get ap
@@ -57,9 +57,9 @@ ostream& operator<<(ostream& os, const Kodaira_code& c)
 //
 // subroutines -- not general purpose (.cc only)
 
-bigint root(const bigint& aa, int e, const bigint & p)  
+bigint root(const bigint& aa, int e, const bigint & p)
 // the e'th root of aa, mod p
-{  
+{
   bigint i, ans, temp; int found=0;
   const bigint& a = mod(aa, p);
   for (i = 1; (! found); ++i)
@@ -95,12 +95,12 @@ int rootsexist(const bigint& bb, const bigint& cc, const bigint& p)
   return rootsexist(one,bb,cc,p);
 }
 
-CurveRed::~CurveRed() 
+CurveRed::~CurveRed()
 {
 }
 
 CurveRed::CurveRed(const CurveRed& E)    : Curvedata(E), N(E.N)
-{ 
+{
   factor_discr(); // will only do anything if not already factored
   reduct_array = E.reduct_array;
 }
@@ -190,7 +190,7 @@ CurveRed::CurveRed(const Curvedata& E)
       reduct_array[p] = Reduction_type
 	(ord_p_discr, ord_p_discr - 2, ord_p_j, 4, c_p);
       continue; } // Type IV
-    
+
     // else change coords so that p|C.a1,C.a2, p^2|C.a3,C.a4, p^3|C.a6
     if ( pdiv2 )
       { s = root(C.a2,2,p);
@@ -212,11 +212,11 @@ CurveRed::CurveRed(const Curvedata& E)
     bb=b*b; cc=c*c; bc=b*c;
     w = 27*d*d - bb*cc + 4*b*bb*d - 18*bc*d + 4*c*cc;
     x = 3*c - bb;
-       
+
     if ( div(p,w) )
       {if ( div(p,x) ) sw = 3; else sw = 2; }
     else sw = 1;
-  
+
 //cout << "Analysing roots of cubic; case " << sw << endl;
 
     switch ( sw ) {
@@ -243,7 +243,7 @@ CurveRed::CurveRed(const Curvedata& E)
         a3t = C.a3/my;
         a4t = (C.a4/p)/mx;
         a6t = (C.a6/mx)/my;
-	temp = a3t*a3t + 4*a6t; 
+	temp = a3t*a3t + 4*a6t;
         if ( div(p,temp ) )
           {if ( pdiv2 ) t = my*root(a6t,2,p);
            else t = my*mod(-a3t*halfmodp, p);
@@ -277,7 +277,7 @@ CurveRed::CurveRed(const Curvedata& E)
         (ord_p_discr, ord_p_discr - ix - iy + 1, ord_p_j,
          10 * (ix + iy) - 49, c_p );
       break;  // Type I*m
-    
+
     case 3:
       // Triple root
       // change coords so that T=0 mod p
@@ -532,7 +532,7 @@ void CurveRed::setLocalRootNumber2()
   if(ri==reduct_array.end()) return;
   Reduction_type& info = ri->second;
   int kod = PariKodairaCode(info.Kcode);
-  int n2  = neron(2,kod); 
+  int n2  = neron(2,kod);
 
 #ifdef DEBUG_ESIGN
   cout<<"\nIn LocalRootNumber2(), n2 = "<<n2<<"..."<<endl;
@@ -552,13 +552,13 @@ void CurveRed::setLocalRootNumber2()
   cout<<"c6="<<c6<<", v6="<<v6<<", v="<<v<<endl;
 #endif
 
-  if (kod > 4)  
+  if (kod > 4)
     {
       info.local_root_number = div(2,a2+a3)? -1: 1;
       return;
     }
 
-  if (kod < -9) 
+  if (kod < -9)
     {
       info.local_root_number = (n2==2)? -kro_m1(v) : -1;
       return;
@@ -572,7 +572,7 @@ void CurveRed::setLocalRootNumber2()
 
   switch(kod)
   {
-  case 1: info.local_root_number = 1; 
+  case 1: info.local_root_number = 1;
     return;
   case 2:
     switch(n2)
@@ -580,142 +580,142 @@ void CurveRed::setLocalRootNumber2()
       case 1:
 	switch(v4)
 	  {
-	  case 4: info.local_root_number = kro_m1(u); 
+	  case 4: info.local_root_number = kro_m1(u);
 	    return;
-	  case 5: info.local_root_number =  1; 
+	  case 5: info.local_root_number =  1;
 	    return;
-	  default: info.local_root_number =  -1; 
+	  default: info.local_root_number =  -1;
 	    return;
 	  }
-      case 2: info.local_root_number = (v6==7) ? 1 : -1; 
+      case 2: info.local_root_number = (v6==7) ? 1 : -1;
 	return;
-      case 3: info.local_root_number = (v%8==5 || (u*v)%8==5) ? 1 : -1; 
+      case 3: info.local_root_number = (v%8==5 || (u*v)%8==5) ? 1 : -1;
 	return;
-      case 4: if (v4>5) 
+      case 4: if (v4>5)
 	{
-	  info.local_root_number = kro_m1(v);    
+	  info.local_root_number = kro_m1(v);
 	  return;
 	}
-      else 
+      else
 	{
-	  info.local_root_number = (v4==5) ? -kro_m1(u) : -1; 
+	  info.local_root_number = (v4==5) ? -kro_m1(u) : -1;
 	  return;
 	}
       }
   case 3:
     switch(n2)
       {
-      case 1: info.local_root_number = -kro_p2(u*v); 
+      case 1: info.local_root_number = -kro_p2(u*v);
 	return;
-      case 2: info.local_root_number = -kro_p2(v); 
+      case 2: info.local_root_number = -kro_p2(v);
 	return;
       case 3: y1=posmod((u-(c6 >> 5)) , 16);
 	info.local_root_number = (y1==7 || y1==11) ? 1 : -1;
 	return;
-      case 4: info.local_root_number = (v%8==3 || (2*u+v)%8==7) ? 1 : -1; 
+      case 4: info.local_root_number = (v%8==3 || (2*u+v)%8==7) ? 1 : -1;
 	return;
-      case 5: info.local_root_number = v6==8 ? kro_p2(x1) : kro_m2(u); 
+      case 5: info.local_root_number = v6==8 ? kro_p2(x1) : kro_m2(u);
 	return;
       }
   case -1:
     switch(n2)
       {
-      case 1: info.local_root_number = -kro_p2(x1); 
+      case 1: info.local_root_number = -kro_p2(x1);
 	return;
-      case 2: info.local_root_number = (v%8==7) || (x1%32==11) ? 1 : -1; 
+      case 2: info.local_root_number = (v%8==7) || (x1%32==11) ? 1 : -1;
 	return;
-      case 3: info.local_root_number = v4==6 ? 1 : -1; 
+      case 3: info.local_root_number = v4==6 ? 1 : -1;
 	return;
-      case 4: if (v4>6) 
+      case 4: if (v4>6)
 	{
-	  info.local_root_number = kro_m1(v); 
+	  info.local_root_number = kro_m1(v);
 	  return;
 	}
-      else 
+      else
 	{
-	  info.local_root_number = v4==6 ? -kro_m1(u*v) : -1; 
+	  info.local_root_number = v4==6 ? -kro_m1(u*v) : -1;
 	  return;
 	}
       }
-  case -2: info.local_root_number = n2==1 ? kro_m2(v) : kro_m1(v); 
+  case -2: info.local_root_number = n2==1 ? kro_m2(v) : kro_m1(v);
     return;
   case -3:
     switch(n2)
       {
       case 1: y1=posmod((u-2*v),64);
-	info.local_root_number = (y1==3) || (y1==19) ? 1 : -1; 
+	info.local_root_number = (y1==3) || (y1==19) ? 1 : -1;
 	return;
-      case 2: 
-	if(kro_m1(u)==1) 
+      case 2:
+	if(kro_m1(u)==1)
 	  {
-	    info.local_root_number = kro_p2(v);  
+	    info.local_root_number = kro_p2(v);
 	    return;
 	  }
-	else 
+	else
 	  {
-	    info.local_root_number = kro_m2(v); 
+	    info.local_root_number = kro_m2(v);
 	    return;
 	  }
-      case 3: 
-	if(kro_m1(u)==1) 
+      case 3:
+	if(kro_m1(u)==1)
 	  {
-	    info.local_root_number = -kro_m2(u*v);  
+	    info.local_root_number = -kro_m2(u*v);
 	    return;
 	  }
-	else 
+	else
 	  {
-	    info.local_root_number = kro_p2(u*v); 
+	    info.local_root_number = kro_p2(u*v);
 	    return;
 	  }
-      case 4: info.local_root_number = v6==11 ? kro_m2(x1) : -kro_m2(u); 
+      case 4: info.local_root_number = v6==11 ? kro_m2(x1) : -kro_m2(u);
 	return;
       }
   case -5:
-    if (n2==1) 
+    if (n2==1)
       {
-	info.local_root_number = x1%32==23 ? 1 : -1; 
+	info.local_root_number = x1%32==23 ? 1 : -1;
 	return;
       }
-    else 
+    else
       {
-	info.local_root_number = -kro_p2(2*u+v); 
+	info.local_root_number = -kro_p2(2*u+v);
 	return;
       }
   case -6:
     switch(n2)
       {
-      case 1: info.local_root_number = 1; 
+      case 1: info.local_root_number = 1;
 	return;
-      case 2: info.local_root_number = v6==10 ? 1 : -1; 
+      case 2: info.local_root_number = v6==10 ? 1 : -1;
 	return;
-      case 3: info.local_root_number = (u%16==11) || ((u+4*v)%16==3) ? 1 : -1; 
+      case 3: info.local_root_number = (u%16==11) || ((u+4*v)%16==3) ? 1 : -1;
 	return;
       }
   case -7:
-    if (n2==1) 
+    if (n2==1)
       {
-	info.local_root_number = 1; 
+	info.local_root_number = 1;
 	return;
       }
     else
       {
         y1= posmod((u+(c6 >> 8)) , 16);
-	if (v6==10) 
+	if (v6==10)
 	  {
-	    info.local_root_number = (y1==9) || (y1==13) ? 1 : -1; 
+	    info.local_root_number = (y1==9) || (y1==13) ? 1 : -1;
 	    return;
 	  }
-	else 
+	else
 	  {
-	    info.local_root_number = (y1==9) || (y1==5) ? 1 : -1; 
+	    info.local_root_number = (y1==9) || (y1==5) ? 1 : -1;
 	    return;
 	  }
       }
-  case -8: info.local_root_number = n2==2 ? kro_m1(v*d1) : -1; 
+  case -8: info.local_root_number = n2==2 ? kro_m1(v*d1) : -1;
     return;
-  case -9: info.local_root_number = n2==2 ? -kro_m1(d1) : -1; 
+  case -9: info.local_root_number = n2==2 ? -kro_m1(d1) : -1;
     return;
-  default: info.local_root_number = -1; 
+  default: info.local_root_number = -1;
     return;
   }
 }
@@ -729,22 +729,35 @@ void CurveRed::setLocalRootNumber3()
   if(ri==reduct_array.end()) return;
   Reduction_type& info = ri->second;
   int kod = PariKodairaCode(info.Kcode);
-  int n2  = neron(3,kod); 
+  int n2  = neron(3,kod);
 
 #ifdef DEBUG_ESIGN
   cout<<"\nIn LocalRootNumber3()..."<<endl;
 #endif
-  bigint mu,mv; long u,v; int v4,v6;
+  bigint mu,mv; long u,v; int v4;
 
-  if (is_zero(c4)) { v4=12; u=0;}
-  else {mu=c4; v4=divide_out(mu,three); u = posmod(mu,81);}
+  if (is_zero(c4)) {
+    v4=12;
+    u=0;
+  }
+  else {
+    mu=c4;
+    v4=divide_out(mu,three);
+    u = posmod(mu,81);
+  }
 
 #ifdef DEBUG_ESIGN
   cout<<"c4="<<c4<<", v4="<<v4<<", u="<<u<<endl;
 #endif
 
-  if (is_zero(c6)) { v=0;}
-  else {mv=c6; v6=divide_out(mv,three); v = posmod(mv,81);}
+  if (is_zero(c6)) {
+    v=0;
+  }
+  else {
+    mv=c6;
+    divide_out(mv,three);
+    v = posmod(mv,81);
+  }
 
 #ifdef DEBUG_ESIGN
   cout<<"c6="<<c6<<", v6="<<v6<<", v="<<v<<endl;
@@ -766,65 +779,65 @@ void CurveRed::setLocalRootNumber3()
   cout<<"K6="<<K6<<endl;
 #endif
 
-  if (kod > 4) 
-    { 
-      info.local_root_number = K6; 
-      return; 
+  if (kod > 4)
+    {
+      info.local_root_number = K6;
+      return;
     }
-  
+
   switch(kod)
     {
-    case 1: case 3: case -3: info.local_root_number = 1; 
-      return; 
+    case 1: case 3: case -3: info.local_root_number = 1;
+      return;
     case 2:
       switch(n2)
 	{
-	case 1: info.local_root_number = (r6==4 || r6>6) ? 1 : -1; 
-	  return; 
-	case 2: info.local_root_number = -K4*K6; 
-	  return; 
-	case 3: info.local_root_number = 1; 
-	  return; 
-	case 4: info.local_root_number = -K6; 
-	  return; 
+	case 1: info.local_root_number = (r6==4 || r6>6) ? 1 : -1;
+	  return;
+	case 2: info.local_root_number = -K4*K6;
+	  return;
+	case 3: info.local_root_number = 1;
+	  return;
+	case 4: info.local_root_number = -K6;
+	  return;
 	}
     case 4:
       switch(n2)
 	{
-	case 1: info.local_root_number = K6*kro_3(d1); 
-	  return; 
-	case 2: info.local_root_number = -K4; 
-	  return; 
-	case 3: info.local_root_number = -K6; 
-	  return; 
+	case 1: info.local_root_number = K6*kro_3(d1);
+	  return;
+	case 2: info.local_root_number = -K4;
+	  return;
+	case 3: info.local_root_number = -K6;
+	  return;
 	}
-    case -2: info.local_root_number = n2==2 ? 1 : K6; 
-      return; 
+    case -2: info.local_root_number = n2==2 ? 1 : K6;
+      return;
     case -4:
       switch(n2)
 	{
 	case 1:
-	  if (v4==4) 
+	  if (v4==4)
 	    {
-	      info.local_root_number = (r6==4 || r6==8) ? 1 : -1; 
-	      return; 
+	      info.local_root_number = (r6==4 || r6==8) ? 1 : -1;
+	      return;
 	    }
-	  else 
+	  else
 	    {
-	      info.local_root_number = (r6==1 || r6==2) ? 1 : -1; 
-	      return; 
+	      info.local_root_number = (r6==1 || r6==2) ? 1 : -1;
+	      return;
 	    }
-	case 2: info.local_root_number = -K6; 
-	  return; 
-	case 3: info.local_root_number = (r6==2 || r6==7) ? 1 : -1; 
-	  return; 
-	case 4: info.local_root_number = K6; 
-	  return; 
+	case 2: info.local_root_number = -K6;
+	  return;
+	case 3: info.local_root_number = (r6==2 || r6==7) ? 1 : -1;
+	  return;
+	case 4: info.local_root_number = K6;
+	  return;
 	}
-    default: info.local_root_number = -1; 
-      return; 
+    default: info.local_root_number = -1;
+      return;
     }
-}  
+}
 
 // Given a prime p not 2 or 3, sets to +1 or -1, the "local root
 // number" or local factor in the sign of the functional equation of
@@ -835,47 +848,47 @@ void CurveRed::setLocalRootNumber_not_2_or_3(const bigint& p)
   auto ri = reduct_array.find(p);
   if(ri==reduct_array.end()) return;
   Reduction_type& info = ri->second;
-  if (info.ord_p_N == 1) 
+  if (info.ord_p_N == 1)
     {
       info.local_root_number = -kro(-c6,p);
       return;
     }
-  
+
   long sp=posmod(p,24);
-  if (info.ord_p_j_denom >0)  
+  if (info.ord_p_j_denom >0)
     {
-      info.local_root_number = kro_m1(sp); 
+      info.local_root_number = kro_m1(sp);
       return;
     }
-  
+
   long ep=12 / gcd(12,info.ord_p_discr);
-  if(ep==4) 
+  if(ep==4)
     {
       info.local_root_number =  kro_m2(sp);
       return;
     }
-  if(odd(ep)) 
+  if(odd(ep))
     {
-      info.local_root_number =  kro_3(sp); 
+      info.local_root_number =  kro_3(sp);
       return;
     }
-  info.local_root_number =  kro_m1(sp); 
+  info.local_root_number =  kro_m1(sp);
 }
 
 
 // Given a prime p, sets to +1 or -1, the "local root number" or local
 // factor in the sign of the functional equation of L(E,s).
 //
-// This function just delegates to subsidiary ones for the cases 
+// This function just delegates to subsidiary ones for the cases
 // p=2, p=3, and p>=5.
 //
 
 void CurveRed::setLocalRootNumber(const bigint& p)
 {
   if (is_zero(p)) return;
-  if (p==2) setLocalRootNumber2(); 
-  else if (p==3) setLocalRootNumber3(); 
-  else  setLocalRootNumber_not_2_or_3(p);  
+  if (p==2) setLocalRootNumber2();
+  else if (p==3) setLocalRootNumber3();
+  else  setLocalRootNumber_not_2_or_3(p);
 }
 
 
@@ -919,8 +932,8 @@ int kro_m1(long x) // kronecker(-1,x) with x>0 odd
 {
   static int kro_m1_tab[4] = {0,1,0,-1};
 #ifdef DEBUG_ESIGN
-  if (!((x>0)&&(odd(x))))  
-    { 
+  if (!((x>0)&&(odd(x))))
+    {
       cout<<"kro_m1() called with x="<<x<<endl;
       return 0;
     }
@@ -932,7 +945,7 @@ int kro_p2(long x) // kronecker(2,x) with x>0 odd
 {
   static int kro_p2_tab[8] = {0,1,0,-1,0,-1,0,1};
 #ifdef DEBUG_ESIGN
-  if (!((x>0)&&(odd(x))))  
+  if (!((x>0)&&(odd(x))))
     {
       cout<<"kro_p2() called with x="<<x<<endl;
       return 0;
@@ -945,7 +958,7 @@ int kro_m2(long x) // kronecker(-2,x) with x>0 odd
 {
   static int kro_m2_tab[8] = {0,1,0,1,0,-1,0,-1};
 #ifdef DEBUG_ESIGN
-  if (!((x>0)&&(odd(x))))  
+  if (!((x>0)&&(odd(x))))
     {
       cout<<"kro_m2() called with x="<<x<<endl;
       return 0;
@@ -958,7 +971,7 @@ int kro_3(long x) // kronecker(x,3)
 {
   static int kro_3_tab[3] = {0,1,-1};
 #ifdef DEBUG_ESIGN
-  if (!(x>0))  
+  if (!(x>0))
     {
       cout<<"kro_3() called with x="<<x<<endl;
       return 0;
@@ -1102,45 +1115,44 @@ bigint Trace_Frob(CurveRed& c, const bigint& p)
   if(f==1)  return BIGINT(-LocalRootNumber(c,p));
 
   int x,a,b,d;
-  bigint n=zero; 
-  if(p==two) // curvemodq class only in characteristic > 3 
+  bigint n=zero;
+  if(p==two) // curvemodq class only in characteristic > 3
     {
       // Count points naively
       // y^2+(a1*x+a3)*y-(x^3+a2*x^2+a4*x+a6) = y^2+ay+b
-      int a1=bigint_mod_long(c.a1,2), a2=bigint_mod_long(c.a2,2), 
-	a3=bigint_mod_long(c.a3,2),  a4=bigint_mod_long(c.a4,2), 
-	a6=bigint_mod_long(c.a6,2);   
+      int a1=bigint_mod_long(c.a1,2), a2=bigint_mod_long(c.a2,2),
+	a3=bigint_mod_long(c.a3,2),  a4=bigint_mod_long(c.a4,2),
+	a6=bigint_mod_long(c.a6,2);
       // x=0:
       a = odd(a3);        // 1 if odd else 0
-      b = odd(a6);               
+      b = odd(a6);
       n += (a?(b?0:2):1);
       // x=1:
-      a = odd(a1+a3); 
-      b = odd(1+a2+a4+a6); 
+      a = odd(a1+a3);
+      b = odd(1+a2+a4+a6);
       n += (a?(b?0:2):1);
       return two-n;
     }
-  if(p==three) // curvemodq class only in characteristic > 3 
+  if(p==three) // curvemodq class only in characteristic > 3
     {
       // Count points naively
       // y^2+(a1*x+a3)*y-(x^3+a2*x^2+a4*x+a6) = y^2+ay+b
-      int a1=bigint_mod_long(c.a1,3), a2=bigint_mod_long(c.a2,3), 
-	a3=bigint_mod_long(c.a3,3),  a4=bigint_mod_long(c.a4,3), 
-	a6=bigint_mod_long(c.a6,3);   
+      int a1=bigint_mod_long(c.a1,3), a2=bigint_mod_long(c.a2,3),
+	a3=bigint_mod_long(c.a3,3),  a4=bigint_mod_long(c.a4,3),
+	a6=bigint_mod_long(c.a6,3);
       for(x=-1; x<2; x++)
 	{
 	  a = (((x+a2)*x+a4)*x+a6)%3;
 	  b = (a1*x+a3)%3;
-	  d = (b*b+a)%3;  
+	  d = (b*b+a)%3;
 	  if(d==2)d=-1;
 	  if(d==-2)d=1;
 	  n += (d+1);
 	}
       return three-n;
     }
-  curvemodq Cq = reduce_curve(c,p); 
+  curvemodq Cq = reduce_curve(c,p);
   n = Cq.group_order();
   bigint ans = one+p-n;
   return ans;
 }
-
diff --git a/libsrc/eclib/mwprocs.h b/libsrc/eclib/mwprocs.h
index 7868f73..051cdca 100644
--- a/libsrc/eclib/mwprocs.h
+++ b/libsrc/eclib/mwprocs.h
@@ -82,7 +82,7 @@ class sieve {
   int verbose, posdisc, firstnl;
   bigfloat xmin,x1,x2,x3;
   int num_aux;
-  long* auxs;
+  vector<long> auxs;
   int** xgood_mod_aux;
   int** x1good_mod_aux;
   int** squares;
diff --git a/libsrc/heights.cc b/libsrc/heights.cc
index 572f75f..644a0eb 100644
--- a/libsrc/heights.cc
+++ b/libsrc/heights.cc
@@ -323,7 +323,6 @@ bigfloat regulator(vector<Point>& P)   // nb not const; sets heights when found
 #ifdef DEBUG_REG
   cout<<"In regulator with PointArray = " << P << endl;
 #endif
-  int i,j,k,d;
   int n = P.size();
   if( n <= 0) return to_bigfloat(1);
   if(n == 1) return height(P[0]) ;
@@ -340,13 +339,13 @@ bigfloat regulator(vector<Point>& P)   // nb not const; sets heights when found
   // initialize the matrix of pairings
   mat_RR height_matrix;
   height_matrix.SetDims(n,n);
-  for (i = 0; i < n; i++)
+  for (int i = 0; i < n; i++)
     {
       height_matrix[i][i] = height(P[i]) ;
     }
-  for (i = 0; i < n; i++)
+  for (int i = 0; i < n; i++)
     {
-      for (j = i + 1; j < n; j++)
+      for (int j = i + 1; j < n; j++)
           {
             Point Q = P[i] + P[j];
             bigfloat h = (height(Q) - height_matrix[i][i] - height_matrix[j][j])/2 ;
@@ -361,9 +360,9 @@ bigfloat regulator(vector<Point>& P)   // nb not const; sets heights when found
   if (n == 3)
     {
      bigfloat pair[3][3] ;
-     for (i = 0; i < 3; i++)
+     for (int i = 0; i < 3; i++)
        {pair[i][i] = height(P[i]) ;
-        for (j = i + 1; j < 3; j++)
+        for (int j = i + 1; j < 3; j++)
           {pair[i][j] = pair[j][i] = height_pairing(P[i], P[j]) ; }
        }
      bigfloat reg = (pair[0][0] * ( pair[1][1] * pair[2][2] - pair[1][2] * pair[1][2] )
@@ -378,9 +377,9 @@ bigfloat regulator(vector<Point>& P)   // nb not const; sets heights when found
   if (n == 4)
     {
      bigfloat pair[4][4] ;
-     for (i = 0; i < 4; i++)
+     for (int i = 0; i < 4; i++)
        {pair[i][i] = height(P[i]) ;
-        for (j = i + 1; j < 4; j++)
+        for (int j = i + 1; j < 4; j++)
           {pair[i][j] = height_pairing(P[i], P[j]) ; }
        }
      //
@@ -413,25 +412,25 @@ bigfloat regulator(vector<Point>& P)   // nb not const; sets heights when found
     }
   bigfloat pair[MAX_RANK_REG][MAX_RANK_REG] ;
   // initialize the matrix of pairings
-  for (i = 0; i < n; i++)
+  for (int i = 0; i < n; i++)
     {
       pair[i][i] = height(P[i]) ;
-      for (j = i + 1; j < n; j++)
+      for (int j = i + 1; j < n; j++)
         {
           pair[j][i] = pair[i][j] = height_pairing(P[i], P[j]) ;
         }
     }
   // Gaussian elimination
   // for the first n - 1 rows
-  for (j = 0 ; j < n - 1; j ++)
+  for (int j = 0 ; j < n - 1; j ++)
     {// use row j to pivot with
       bigfloat pivot = pair[j][j] ;
       // kill off rows below row j
-      for (i = j + 1; i < n ; i ++)
+      for (int i = j + 1; i < n ; i ++)
         {bigfloat multiplier = pair[i][j] / pivot ;
           // subtract multiplier * row j from row i
           //noting the beginning of row i is already zeroed
-          for (k = j ; k < n; k++)
+          for (int k = j ; k < n; k++)
             {
               pair[i][k] -= multiplier * pair[j][k] ;
             }
@@ -439,7 +438,7 @@ bigfloat regulator(vector<Point>& P)   // nb not const; sets heights when found
     }
   // now reg is the product of the diagonal entries
   bigfloat reg = to_bigfloat(1) ;
-  for (d = 0; d < n; d++) reg *= pair[d][d] ;
+  for (int d = 0; d < n; d++) reg *= pair[d][d] ;
   return reg ;
 #endif
 }
diff --git a/libsrc/homspace.cc b/libsrc/homspace.cc
index dc7b4aa..202eb43 100644
--- a/libsrc/homspace.cc
+++ b/libsrc/homspace.cc
@@ -309,11 +309,11 @@ if (verbose>1)
    }
 
    // Compute the number of cusps
-   long maxncusps =0, dd, pp, nc;
+   long maxncusps =0, nc;
    for( const auto& d : dlist)
      {
-       nc = ::gcd(dd,modulus/d);
-       for( const auto& p : plist) // computing phi(dd)
+       nc = ::gcd(d,modulus/d);
+       for( const auto& p : plist) // computing phi(d)
          {
            if ((nc%p)==0)
              nc = nc*(p-1)/p;
diff --git a/libsrc/isogs.cc b/libsrc/isogs.cc
index 776b6a5..efbbc68 100644
--- a/libsrc/isogs.cc
+++ b/libsrc/isogs.cc
@@ -365,12 +365,14 @@ void IsogenyClass::displaymat(ostream& os)const
   os << "Isogeny matrix:\n";
   os << "\t";
   for(j=0; j<ncurves; j++)
-    os<<(j+1)<<"\t";  os<<"\n";
+    os<<(j+1)<<"\t";
+  os<<"\n";
   for(i=0; i<ncurves; i++)
     {
       os<<(i+1)<<"\t";
       for(j=0; j<ncurves; j++)
-        os<<mat_entry(i,j)<<"\t";  os<<"\n";
+        os<<mat_entry(i,j)<<"\t";
+      os<<"\n";
     }
   os<<endl;
 }
diff --git a/libsrc/mat.cc b/libsrc/mat.cc
index cec2691..0243013 100644
--- a/libsrc/mat.cc
+++ b/libsrc/mat.cc
@@ -1471,7 +1471,7 @@ mat mat_from_mat_zz_p(const mat_zz_p& A, scalar pr) // type of scalar fixes retu
 mat ref_via_ntl(const mat& M, vec& pcols, vec& npcols,
                 long& rk, long& ny, scalar pr)
 {
- long nr=M.nrows(), nc=M.ncols();
+ long nc=M.ncols();
  long i, j, k;
 #ifdef TRACE_NTL_REF
  timer ntl_timer;
@@ -1532,7 +1532,6 @@ mat ref_via_ntl(const mat& M, vec& pcols, vec& npcols,
  cout<<endl;
 #endif
  return ans;
-
 }
 
 long rank_via_ntl(const mat& M, scalar pr)
@@ -1602,7 +1601,7 @@ void mod_mat_from_mat(mod_mat& A, const mat& M, scalar pr)
 
 mat mat_from_mod_mat(const mod_mat& A, scalar a) // scalar just to fix return type
 {
-  long nr=mod_mat_nrows(A), nc=mod_mat_ncols(A);
+ long nr=mod_mat_nrows(A), nc=mod_mat_ncols(A);
 
   // create matrix copy of A:
   mat M(nr, nc);
@@ -1615,9 +1614,6 @@ mat mat_from_mod_mat(const mod_mat& A, scalar a) // scalar just to fix return ty
 
 mat ref_via_flint(const mat& M, scalar pr)
 {
-  long nr=M.nrows(), nc=M.ncols();
-  long i, j;
-
   // create flint matrix copy of M:
   mod_mat A;
   mod_mat_from_mat(A,M,pr);
@@ -1626,6 +1622,7 @@ mat ref_via_flint(const mat& M, scalar pr)
 #ifdef TRACE_FLINT_RREF
   timeit_t t;
   timeit_start(t);
+  long nc=M.ncols(), nr=mod_mat_nrows(A);
   cerr<<"(nr,nc)=("<<nr<<","<<nc<<"): "<<flush;
 #endif
   mod_mat_rref(A);
@@ -1648,7 +1645,7 @@ mat ref_via_flint(const mat& M, scalar pr)
 mat ref_via_flint(const mat& M, vec& pcols, vec& npcols,
                                   long& rk, long& ny, scalar pr)
 {
-  long nr=M.nrows(), nc=M.ncols();
+  long nc=M.ncols();
   long i, j, k;
 
 #ifdef TRACE_FLINT_RREF
@@ -1668,6 +1665,7 @@ mat ref_via_flint(const mat& M, vec& pcols, vec& npcols,
 #ifdef TRACE_FLINT_RREF
   timeit_t t;
   timeit_start(t);
+  long nr=M.nrows();
   cerr<<"(nr,nc)=("<<nr<<","<<nc<<"): "<<flush;
 #endif
 
diff --git a/libsrc/mglobsol.cc b/libsrc/mglobsol.cc
index 5ff65f1..b835b7e 100644
--- a/libsrc/mglobsol.cc
+++ b/libsrc/mglobsol.cc
@@ -101,7 +101,6 @@ quartic_sieve::quartic_sieve(quartic * gg, int moduli_option, int verb)
     {
       nwprimes=25;
       wprimes.reserve(nwprimes);
-      long nwp=0;
       long a8=mod(a,8); long b8=mod(2*b,8); long c8=mod(4*c,8);
       long e8=mod(e,8); long d8=mod(2*d,8);
       long z0, t, tt, x, p;
@@ -117,7 +116,7 @@ quartic_sieve::quartic_sieve(quartic * gg, int moduli_option, int verb)
 	}
       if(!two_is_ok) wprimes.push_back(2);
       primevar pr; pr++; // to start at 3
-      while(wprimes.size()<nwprimes)
+      while((long)wprimes.size()<nwprimes)
 	{
 	  p=pr; pr++;
 	  if(legendre(a,p)==-1) wprimes.push_back(p);
@@ -127,7 +126,6 @@ quartic_sieve::quartic_sieve(quartic * gg, int moduli_option, int verb)
 
 // repeat for u-primes:
       uprimes.reserve(nwprimes);
-      nwp=0;
       two_is_ok = 0;
       for(z0=0; (z0<4) && !two_is_ok; z0++)
 	{
@@ -140,7 +138,7 @@ quartic_sieve::quartic_sieve(quartic * gg, int moduli_option, int verb)
 	}
       if(!two_is_ok) uprimes.push_back(2);
       pr.init(); pr++; // to start at 3
-      while(uprimes.size()<nwprimes)
+      while((long)uprimes.size()<nwprimes)
 	{
 	  p=pr; pr++;
 	  if(legendre(e,p)==-1) uprimes.push_back(p);
@@ -175,7 +173,7 @@ quartic_sieve::quartic_sieve(quartic * gg, int moduli_option, int verb)
   squares.resize(num_aux);
   umod.resize(num_aux);
 
-  long i,j;
+  long i=0,j;
   for ( const auto& aux : auxs)
     {
       long half_aux = ((aux + 1) / 2);
@@ -183,6 +181,7 @@ quartic_sieve::quartic_sieve(quartic * gg, int moduli_option, int verb)
       for (j = 0; j < aux; j++)      squares[i][j]=0;
       for (j = 0; j < half_aux; j++) squares[i][posmod( j*j, aux )]=1;
       xgood_mod_aux[i].resize(aux);
+      i++;
     }  // end of aux loop
 
   if(verbose>1)
diff --git a/libsrc/mquartic.cc b/libsrc/mquartic.cc
index 2cbf631..750f320 100644
--- a/libsrc/mquartic.cc
+++ b/libsrc/mquartic.cc
@@ -69,17 +69,17 @@ void quartic::set_roots_and_type()
   if(is_zero(diff)) cout<<"Syzygy satisfied.\n";
   else cout<<"Syzygy NOT satisfied.\n";
 #endif
-  int nrr;
-  if(disc<0) 
-    {type=3; nrr=2;}       // 2 real roots
-  else 
+  if(disc<0)
+    {type=3;}       // 2 real roots
+  else
     {
       if((sign(H)<0)&&(sign(Q)>0)) 
-	{type=2; nrr=4;}   // 4 real roots
-      else 
-	{type=1; nrr=0;}   // 0 real roots
+	{type=2;}   // 4 real roots
+      else
+	{type=1;}   // 0 real roots
     }
 #ifdef DEBUG_ROOTS
+  int nrr = (type==3? 2 : (type==2? 4 : 0));
   cout<<"Type = " << type << " ("<<nrr<<" real roots)\n";
 #endif
   bigcomplex c1(to_bigfloat(0)), c2(-3*I2bigfloat(ii)), c3(I2bigfloat(jj));
diff --git a/libsrc/mrank2.cc b/libsrc/mrank2.cc
index 3bc0027..9084beb 100644
--- a/libsrc/mrank2.cc
+++ b/libsrc/mrank2.cc
@@ -380,14 +380,18 @@ void rank2::find_elsgens(int which, const bigint& c, const bigint& d)
 
 void rank2::find_els2gens(int which, const bigint& c, const bigint& d)
 {
-  if (verbose>1) 
+  if (verbose>1)
     {
       if(which) cout<<"\n";
-      cout<<"Finding els2 gens for E"; if(which) cout<<"'";
-      cout<<" (c"; if(which) cout<<"'";
-      cout<<"= "<<c<<", d"; if(which) cout<<"'";
-      cout<<"= "<<d<<") which lift to S^2(E"; 
-      if(which) cout<<"'"; cout<<")"<<endl;
+      cout<<"Finding els2 gens for E";
+      if(which) cout<<"'";
+      cout<<" (c";
+      if(which) cout<<"'";
+      cout<<"= "<<c<<", d";
+      if(which) cout<<"'";
+      cout<<"= "<<d<<") which lift to S^2(E";
+      if(which) cout<<"'";
+      cout<<")"<<endl;
     }
 
   vector<bigint>& elsgens = (which? elsgens1: elsgens0);
@@ -423,7 +427,7 @@ void rank2::find_els2gens(int which, const bigint& c, const bigint& d)
       else
 	cout<<"Just incremented nels2gens  to "<<nels2gens<<endl;
       cout<<"now bitmask = "<<els2_space.getbitmask()<<endl;
-#endif	      
+#endif
     } // end of torsion loop
 
   int res, verb=0; if(verbose>2)verb=verbose-2;
diff --git a/libsrc/mwprocs.cc b/libsrc/mwprocs.cc
index e611f6f..a78fa7b 100644
--- a/libsrc/mwprocs.cc
+++ b/libsrc/mwprocs.cc
@@ -739,51 +739,25 @@ sieve::sieve(Curvedata * EE, mw* mwb, int moduli_option, int verb)
 
   switch(moduli_option) {
   case 1:
-    num_aux = 10; 
-    auxs = new long[num_aux];
-    auxs[0]=3;
-    auxs[1]=5;
-    auxs[2]=7;
-    auxs[3]=11;
-    auxs[4]=13;
-    auxs[5]=17;
-    auxs[6]=19;
-    auxs[7]=23;
-    auxs[8]=29;
-    auxs[9]=31;
+    num_aux = 10;
+    auxs = {3, 5, 7, 11, 13, 17, 19, 23, 29, 31};
     break;
 
   case 2:// the following taken from Gebel's scheme
-    num_aux = 3; 
-    auxs = new long[num_aux];
-    auxs[0]=5184;  // = (2^6)*(3^4)   // old: 6624; //  = (2^5)*(3^2)*23
-    auxs[1]=5929;  // = (7^2)*(11^2)  // old: 8075; //  = (5^2)*17*19
-    auxs[2]=4225;  // = (5^2)*(13^2)  // old: 7007; //  = (7^2)*11*13
+    num_aux = 3;
+    auxs = {5184, 5929, 4225}; // 5184 = (2^6)*(3^4), 5929 = (7^2)*(11^2), 4225 = (5^2)*(13^2)
     break;
 
   case 3:
   default:
     num_aux = 9;
-    auxs = new long[num_aux];
-    auxs[0]=32;
-    auxs[1]= 9;
-    auxs[2]=25;
-    auxs[3]=49;
-    auxs[4]=11;
-    auxs[5]=13;
-    auxs[6]=17;
-    auxs[7]=19;
-    auxs[8]=23;
+    auxs = {32, 9, 25, 49, 11, 13, 17, 19, 23};
     break;
   }
 
 #ifdef DEBUG_SIEVE
-  if(verbose) 
-    {
-      cout<<"Using "<<num_aux<<" sieving moduli:\n";
-      for(i=0; i<num_aux; i++) cout << auxs[i]<<"\t";
-      cout<<endl;
-    }
+  if(verbose)
+    cout<<"Using "<<num_aux<<" sieving moduli:\n" << auxs <<endl;
 #endif
 
   xgood_mod_aux = new int*[num_aux];
@@ -805,7 +779,7 @@ sieve::sieve(Curvedata * EE, mw* mwb, int moduli_option, int verb)
   if(verbose) 
     {
       cout<<"squares lists:\n";
-      for(i=0; i<num_aux; i++) 
+      for(i=0; i<num_aux; i++)
 	{
 	  cout << auxs[i]<<":\t";
 	  for(j=0; j<auxs[i]; j++) if(squares[i][j]) cout<<j<<"\t";
@@ -824,7 +798,6 @@ sieve::sieve(Curvedata * EE, mw* mwb, int moduli_option, int verb)
 
 sieve::~sieve()
 {
-  delete [] auxs;
   for(long i=0; i<num_aux; i++) 
     {
       delete [] xgood_mod_aux[i];
@@ -913,69 +886,42 @@ void sieve::search(bigfloat h_lim)
       for (long index = 0; index < num_aux; index++)
 	{
 	  aux = auxs[index];
-
-// 	  if(gcd(c,aux)==1)  // the easy case
-// 	    {
-// 	      long xcc=0, csqm=csq%aux;;
-// 	      int* flag = xgood_mod_aux[index];
-// 	      int* flag1 = x1good_mod_aux[index];
-// 	      x=aux; 
-// 	      while(x--)
-// 		{
-// 		  *flag = *flag1++;
-// 		  xcc+=csqm; flag+=csqm; 
-// 		  if(xcc>=aux) {xcc-=aux; flag-=aux;}
-// 		}
-// 	    }
-// 	  else  // c, aux have common factor
-// 	    {
-// 	      if(odd(aux)&&((csq%aux)==0))
-// 		{
-// 		  int* flag = xgood_mod_aux[index];
-// 		  int* sqs = squares[index];
-// 		  x=aux; 
-// 		  while(x--) *flag++ = *sqs++;
-// 		}  // end of if(odd(aux))
-// 		else  //default: full recomputation
-		  {
-		    pd1 = posmod(d1 , aux);
-		    pd2 = posmod(d2 , aux);
-		    pd3 = posmod(d3 , aux);
-		    pd4 = posmod(d4 , aux);
-		    pd6 = posmod(d6 , aux);
-		    
-		    long dddf= 24%aux;
-		    long ddf = posmod(2*(pd1*pd1)%aux + 8*pd2+24 , aux);
-		    long df  = posmod(pd1*(pd1+2*pd3)%aux + 4*(pd4+pd2+1) , aux);
-		    long f   = posmod(((pd3*pd3)%aux+4*pd6) , aux);
-		    
-		    int* flag = xgood_mod_aux[index];
-		    int* sqs = squares[index];
-		    long x=aux;
+          {
+            pd1 = posmod(d1 , aux);
+            pd2 = posmod(d2 , aux);
+            pd3 = posmod(d3 , aux);
+            pd4 = posmod(d4 , aux);
+            pd6 = posmod(d6 , aux);
+
+            long dddf= 24%aux;
+            long ddf = posmod(2*(pd1*pd1)%aux + 8*pd2+24 , aux);
+            long df  = posmod(pd1*(pd1+2*pd3)%aux + 4*(pd4+pd2+1) , aux);
+            long f   = posmod(((pd3*pd3)%aux+4*pd6) , aux);
+
+            int* flag = xgood_mod_aux[index];
+            int* sqs = squares[index];
+            long x=aux;
 #ifdef DEBUG_SIEVE
-  if(verbose) 
-    {
-      cout<<"aux = "<< aux <<"\n ";
-      cout<<"pd1,...,pd6 = "<<pd1<<", "<<pd2<<", "<<pd3<<", "<<pd4<<", "<<pd6<<"\n";
-    }
+            if(verbose) 
+              {
+                cout<<"aux = "<< aux <<"\n ";
+                cout<<"pd1,...,pd6 = "<<pd1<<", "<<pd2<<", "<<pd3<<", "<<pd4<<", "<<pd6<<"\n";
+              }
 #endif
-		    while(x--)
-		      {
-			*flag++ = sqs[f];
+            while(x--)
+              {
+                *flag++ = sqs[f];
 #ifdef DEBUG_SIEVE
-  if(verbose) 
-    {
-      cout<<"x = "<< aux-x-1 <<", f(x) = "<<f<<": flag = "<<sqs[f]<<"\n";
-    }
+                if(verbose)
+                  {
+                    cout<<"x = "<< aux-x-1 <<", f(x) = "<<f<<": flag = "<<sqs[f]<<"\n";
+                  }
 #endif
-			f   +=  df; if(f  >=aux) f  -=aux;
-			df  += ddf; if(df >=aux) df -=aux;
-			ddf +=dddf; if(ddf>=aux) ddf-=aux;
-		      }
-		    
-		  }  // end of default case
-
-// 	    }  // end of non-coprime case
+                f   +=  df; if(f  >=aux) f  -=aux;
+                df  += ddf; if(df >=aux) df -=aux;
+                ddf +=dddf; if(ddf>=aux) ddf-=aux;
+              }
+          }  // end of default case
  	}  // end of aux loop
 #ifdef DEBUG_SIEVE
   if(verbose) 
@@ -1100,13 +1046,13 @@ cout<<"amin = " << amin << ", amax = " << amax <<  endl;
 	      pd3 = posmod(d3 , aux);
 	      pd4 = posmod(d4 , aux);
 	      pd6 = posmod(d6 , aux);
-	    
+
 	      long dddf= 24%aux;
 	      long ddf = posmod(2*(pd1*pd1)%aux + 8*pd2+24 , aux);
 	      long df  = posmod(pd1*(pd1+2*pd3)%aux + 4*(pd4+pd2+1) , aux);
 	      long f   = posmod(((pd3*pd3)%aux+4*pd6) , aux);
-	    
-	      int* flag = xgood_mod_aux[index];
+
+              int* flag = xgood_mod_aux[index];
 	      int* sqs = squares[index];
 	      long x=aux;
 	      while(x--)
@@ -1130,18 +1076,18 @@ void sieve::a_search(const long& amin, const long& amax)
   a--;
   if (verbose) cout<<"sieve::search: trying c = "<<c<<"\t"
                    <<"("<<amin<<" <= a <= "<<amax<<")"<<endl;
-  
+
   for (i=0; i < num_aux; i++)  amod[i] = posmod(a, auxs[i]);
   amodc = posmod(a,c);
 #ifdef DEBUG_SIEVE
-  if(verbose) 
+  if(verbose)
     {
       cout<<"Initial a =  "<<a<<" modulo moduli = \t";
       for(i=0; i<num_aux; i++) cout << amod[i]<<"\t";
       cout<<endl;
     }
 #endif
-      
+
   while (a < amax)
     {
       a++;
@@ -1155,9 +1101,8 @@ void sieve::a_search(const long& amin, const long& amax)
 	{
 	  ascore++;
 	}
-      // DON'T add "else continue; (with next a) 
-      // as the amod[i] are not yet updated!	  
-//    for ( i=0; (i<num_aux); i++)
+      // DON'T add "else continue; (with next a)
+      // as the amod[i] are not yet updated!
       for ( i=num_aux-1; (i>=0); i--)
 	{ long& amodi = amod[i];
 	  amodi++;
diff --git a/libsrc/newforms.cc b/libsrc/newforms.cc
index 7a1a00a..244102b 100644
--- a/libsrc/newforms.cc
+++ b/libsrc/newforms.cc
@@ -1154,8 +1154,6 @@ void newforms::display(void) const
   }
 }
 
-#define DEBUG_SCALING
-
 void newforms::display_modular_symbol_map(int check) const
 {
  long i,j,k;
@@ -1787,21 +1785,19 @@ void newforms::makebases(int flag, int all_nf)
   // basisflag controls what ::use() does with the nfs when found
   // j1ds counts through the newforms as they are found
   basisflag=flag;
-  int i;
   j1ds = 0; // counts through newforms as they are recovered
   vector< vector<long> > eigs;
 
   if (all_nf)
     {
-      nf_subset.clear();
-      for(i=0; i<n1ds; i++)
-        nf_subset.push_back(i);
+      nf_subset.resize(n1ds);
+      std::iota(nf_subset.begin(), nf_subset.end(), 0);
     }
 
   unfix_eigs();
   sort();
-  for(i=0; i<nf_subset.size(); i++)
-    eigs.push_back(nflist[nf_subset[i]].aplist);
+  for (const auto nfi : nf_subset)
+    eigs.push_back(nflist[nfi].aplist);
 
   splitspace.recover(eigs);  // NB newforms::use() determines what is
 			     // done with each one as it is found;
@@ -1827,12 +1823,11 @@ void newforms::merge(int all_nf)
   mvlminusvecs.clear();
   if (verbose>1)
     cout<<"merging newforms " << nf_subset << endl;
-  int inf, jnf;
   unfix_eigs();
   sort();
-  for(jnf=0; jnf<nf_subset.size(); jnf++)
+  for (const auto nfi : nf_subset)
    {
-     inf = nf_subset[jnf];
+     int inf = nf_subset[nfi];
      if(verbose) cout << "Newform #"<<(inf+1)<<":"<<endl;
      if(verbose) cout << "-about to extend bplus,bminus..."<<flush;
      bplus.init(h1->nsymb);
@@ -1882,9 +1877,9 @@ vector<long> newforms::apvec(long p) //  computes a[p] for each newform
   //cout<<"In apvec with p = "<<p<<endl;
   vector<long> apv(n1ds);
   vec v;
-  long i,j,iq,ap; 
+  long i,iq,ap;
   if(::divides(p,modulus)) // we already have all the aq
-    { 
+    {
       if(::divides(p*p,modulus))
 	for (i=0; i<n1ds; i++) apv[i] = 0;
       else
@@ -1894,7 +1889,7 @@ vector<long> newforms::apvec(long p) //  computes a[p] for each newform
 	}
       return apv;
     }
-  
+
   // now p is a good prime
 
   long maxap=(long)(2*sqrt((double)p)); // for validity check
diff --git a/libsrc/oldforms.cc b/libsrc/oldforms.cc
index 1d13f1e..44fd320 100644
--- a/libsrc/oldforms.cc
+++ b/libsrc/oldforms.cc
@@ -176,7 +176,7 @@ void oldforms::getoldclasses(long d, int verbose)
 	}
       if(verbose>1) cout<<"betas: "<<betalist<<endl;
       vector<long> nextoldformap(nap);
-      primevar pr; long iform, c, ip, p, aq; int bit;
+      primevar pr; long iform, c, ip, aq; int bit;
       for(iform=0; iform<nforms; iform++)
 	{
 	  vector<long>& aqlist=olddata.nflist[iform].aqlist;
diff --git a/libsrc/pcprocs.cc b/libsrc/pcprocs.cc
index 37c1838..89a03f1 100644
--- a/libsrc/pcprocs.cc
+++ b/libsrc/pcprocs.cc
@@ -79,7 +79,8 @@ int newforms::find_matrix(long i, long dmax, int&rp_known, bigfloat&x0, bigfloat
 
   for(d=nf_d; (d<dmax)||(!have_both); d++)
     {
-      if(gcd(modulus,d)!=1) continue; long d2=d/2;
+      if(gcd(modulus,d)!=1) continue;
+      long d2=d/2;
       b1 = 1;
       if(d==nf_d) b1=nf_b;
       //      for(b=b1; (b<=d2)&&(!have_both); b++)
@@ -261,7 +262,6 @@ int get_curve(long n, long fac, long maxnx, long maxny,
             c4err = abs(I2bigfloat(ic4)-real(c4));
             c6err = abs(I2bigfloat(ic6)-real(c6));
             c4c6err = max(c4err, c6err);
-	    int close = (c4c6err<0.001);
 	    int validc4c6 = 0;
             validc4c6 = valid_invariants(ic4,ic6);
             if((validc4c6)&&detail)
@@ -276,11 +276,7 @@ int get_curve(long n, long fac, long maxnx, long maxny,
               {
                 if (detail>1) cout << "Invalid c-invariants" << endl;
               }
-            // We relax the closeness criterion here, but do not
-            // ignore it completely since there have been cases where
-            // c4,c6 were valid & give the right conductor but are not
-            // actually correct.
-	    close = (c4c6err<0.01);
+
 	    if(validc4c6)
 	      {
 		Curve C(ic4,ic6);
diff --git a/libsrc/smat_elim.cc b/libsrc/smat_elim.cc
index b7a3575..a81d0f7 100644
--- a/libsrc/smat_elim.cc
+++ b/libsrc/smat_elim.cc
@@ -416,8 +416,8 @@ smat smat_elim::kernel( vec& pc, vec& npc)
 
 smat smat_elim::new_kernel( vec& pc, vec& npc)
 {
-  int i,ic,ir, j, jj, ip, t,tt, n, r, c;
-  scalar v, w;
+  int i,ir, j, jj, t, r, c;
+  scalar v;
 
 #if TRACE_ELIM
   cout<<"Starting sparse_elimination()..."<<flush;
@@ -870,12 +870,12 @@ void smat_elim::step4 ( )
     }
   int M0 = maxcolwt; // max(20, int(maxcolwt/10)); // 20;
   int Mstep = int(maxcolwt/100);
-  float Mscale = 0.9;
   if (Mstep==0) Mstep=1;
 #if TRACE_ELIM
   cout<<"Step 4, max column weight = "<<maxcolwt<<endl;  
 #endif
 
+  //float Mscale = 0.9;
   //for( M = M0; M >= 4; M--)
   //for( M = M0; M >= 3; M*=Mscale)
   for( M = M0; M >= 3; M-=Mstep)
diff --git a/libsrc/xsplit.cc b/libsrc/xsplit.cc
index fba7087..7b08f34 100644
--- a/libsrc/xsplit.cc
+++ b/libsrc/xsplit.cc
@@ -117,7 +117,6 @@ smat form_finder::make_nested_submat(long ip, ff_data &data)
   long depth = data.depth_;  // current depth
   long subdim = data.subdim_;  // current dimension
   ff_data *d = &data; // Pointer to nodes
-  int i, j, level;
 
   ECLOG(1) << "Computing operator of size " << subdim
            << " at depth " << depth << "..." << flush;
@@ -126,7 +125,7 @@ smat form_finder::make_nested_submat(long ip, ff_data &data)
 
   vec jlist = iota((scalar)subdim);
   smat b = d->rel_space_->bas();
-  level = depth;
+  int level = depth;
   while (level--)
     {
       ECLOG(2) << "["<<level<<"]" << flush;
@@ -273,20 +272,16 @@ void form_finder::make_basis( ff_data &data ) {
     return;
   }
 
-  ssubspace* s;
-  if( bigmats ) {
-    s = data.abs_space_;  // only used when depth>0
-  }
-  ssubspace *spm_rel, *spm_abs;
+  ssubspace *spm_rel; //, *spm_abs;
   SCALAR eig = denom1;
-  // if(depth) eig*=denom(*s);
   smat subconjmat;            // only used when depth>0
   if( bigmats ) {
+    ssubspace* s;
+    s = data.abs_space_;  // only used when depth>0
     subconjmat = (depth) ? restrict_mat(data.conjmat_, *s) : data.conjmat_;
     // will only be a 2x2 in this case (genus 1 only!)
   }
   else {
-    //subconjmat = h->s_opmat_restricted(-1,*s,1,verbose);
     subconjmat = make_nested_submat(-1,data);
   }
 
diff --git a/progs/aplist.cc b/progs/aplist.cc
index 6f44065..233d2bb 100644
--- a/progs/aplist.cc
+++ b/progs/aplist.cc
@@ -35,7 +35,7 @@ int main()
   cout<<"Enter output filename: ";
   cin>>filename;
   ofstream output(filename.c_str());
-  int n1,n2; short temp;
+  int n1,n2;
   cout<<"Enter first and last values of n: ";
   cin>>n1>>n2;
   for (int n=n1; n<=n2; n++)
@@ -45,17 +45,15 @@ int main()
       if (!datafile) cout<<"No file "<<data<<" exists!"<<endl;
       else
         {
-          int i,ic,xic,ip,jp,p,iq,nnf,naq,nap,nx;
+          int i,ic,xic,ip,jp,p,iq,nnf,naq;
 	  int nbigprimes = 5;  // max no. of primes over 100
 
-	  short temp_short;
 	  int temp_int;
 	  datafile.read((char*)&temp_int,sizeof(int));   // = number of newforms
 	  nnf=temp_int;
 	  datafile.read((char*)&temp_int,sizeof(int));   // = number of bad primes
 	  naq=temp_int;
 	  datafile.read((char*)&temp_int,sizeof(int));   // = number of eigs
-	  nap=temp_int;
 	  if(nnf==0) continue;
 
 	      // skip over extra data for each newform
@@ -139,7 +137,7 @@ int main()
 		      else output<<setw(3)<<ap;
 		    }
                 }
-	      for(i=0; i<bigptable.size(); i++)
+	      for(i=0; i<(int)bigptable.size(); i++)
                 {
                   if (aqtable[ic][iq++]==1) output<<" +"; else output<<" -";
                   output<<"("<<bigptable[i]<<")";
diff --git a/progs/checkap.cc b/progs/checkap.cc
index c289e14..0cfec3d 100644
--- a/progs/checkap.cc
+++ b/progs/checkap.cc
@@ -32,9 +32,8 @@ const long MAXNAP = 100000;
 
 int main(void)
 {
-  long firstn, lastn, n, nnf, naq, nap, n2ds, ap, i, j, p;
+  long firstn, lastn, n, nnf, naq, nap, i, j, p;
   int ok, allok=1;
-  short temp;
   cout<<"Enter first and last N: "; cin>>firstn>>lastn;
   for(n=firstn; n<=lastn; n++)
     {
@@ -47,7 +46,6 @@ int main(void)
 	}
       else 
 	{
-	  short temp_short;
 	  int temp_int;
 	  datafile.read((char*)&temp_int,sizeof(int));   // = number of newforms
 	  nnf=temp_int;
@@ -62,12 +60,12 @@ int main(void)
 	      int* batch_i = new int[ntotal];
 	      datafile.read((char*)batch_i,ntotal*sizeof(int));
               delete[] batch_i;
-              
+
 	      // skip over aq for each newform
 	      ntotal = naq*nnf;
 	      short* batch = new short[ntotal];
 	      datafile.read((char*)batch,ntotal*sizeof(short));
-	      
+
 	      // read and check ap for each newform
 	      ntotal = nap*nnf;
 	      delete[] batch;
@@ -92,7 +90,7 @@ int main(void)
 	      delete[] batch;
 	    } // ends if(nnf>0)
 	} // ends if(datafile)
-	    
+
       datafile.close();
       if(ok) cout << n << " ";
       else
diff --git a/progs/h1clist.cc b/progs/h1clist.cc
index 57d5669..e6041ca 100644
--- a/progs/h1clist.cc
+++ b/progs/h1clist.cc
@@ -70,7 +70,7 @@ int main(void)
   int noldap=25;
   nf.createfromdata(1,noldap,0); // do not create from scratch if data absent
   int nnf = nf.n1ds;
-  int inf = 1;
+  //  int inf = 1;
   if(nnf>0)
     {
       // cout<<"****************************"<<endl;
diff --git a/progs/h1first.cc b/progs/h1first.cc
index 318a885..cf5f492 100644
--- a/progs/h1first.cc
+++ b/progs/h1first.cc
@@ -92,11 +92,11 @@ int main(void)
       nf.sort_into_Cremona_label_order();
 #endif
       int all_nf = 1; // default; means do all
-      int inf = 1;
 #ifdef SINGLE
       all_nf = 0;
       nf.nf_subset.clear();
       cout << "Enter list of form numbers (between 1 and "<<nnf<<"), ending with 0: ";
+      int inf = 1;
       cin>>inf;
       while((inf>0)&&(inf<=nnf))
         {
diff --git a/progs/moreap.cc b/progs/moreap.cc
index 184e30f..965d83e 100644
--- a/progs/moreap.cc
+++ b/progs/moreap.cc
@@ -34,7 +34,7 @@
 int main(void)
 {
  int n=1; 
- int lastn, stopp, output, showeigs, showforms, findcurves;
+ int stopp, output, showeigs, showforms, findcurves;
  int nnf, nap;
  cout << "Program moreap\n";
  cout << "---------------\n\n";
@@ -48,6 +48,7 @@ int main(void)
  if(findcurves) set_precision(60);
 #endif
 #ifdef AUTOLOOP
+ int lastn;
  cout << "How many primes for Hecke eigenvalues? ";
  cin  >> stopp; cout << endl;
  cout<<"Enter first and last N: ";cin>>n>>lastn; n--;
diff --git a/progs/nfcount.cc b/progs/nfcount.cc
index c481464..c521bca 100644
--- a/progs/nfcount.cc
+++ b/progs/nfcount.cc
@@ -28,7 +28,6 @@
 int main(void)
 {
   int limit,n=1,count=0,firstn, verbose; 
-  int getindex=0;
   cout << "Verbose? (0/1) " << endl;  cin >> verbose;
   cout<<"Enter first and last N: ";cin>>firstn>>limit; 
   n=firstn-1; cout<<endl;
diff --git a/progs/nfhpcurve.cc b/progs/nfhpcurve.cc
index 208367b..3a74588 100644
--- a/progs/nfhpcurve.cc
+++ b/progs/nfhpcurve.cc
@@ -79,8 +79,10 @@ int main(void)
  if (n>1)
 {
   if (curve_output)
-    curve_out_filename = single_curve_filename(n);
-    curve_out.open(curve_out_filename.c_str());
+    {
+      curve_out_filename = single_curve_filename(n);
+      curve_out.open(curve_out_filename.c_str());
+    }
   cout << ">>>Level " << n;
   // Temporary code to skip non-square-free levels
   //
@@ -100,7 +102,7 @@ int main(void)
       cout << "Finished level "<<n<<endl;
       continue;
     }
-  int plus=1, cuspidal=0;
+  int plus=1;
   newforms nf(n,verbose); 
   int noldap=25;
   nf.createfromscratch(plus,noldap);
diff --git a/progs/nfhpmcurve.cc b/progs/nfhpmcurve.cc
index 28beed1..68f09c3 100644
--- a/progs/nfhpmcurve.cc
+++ b/progs/nfhpmcurve.cc
@@ -87,7 +87,6 @@ int main(void)
       cout << "Finished level "<<n<<endl;
       continue;
     }
-  int plus=1, cuspidal=0;
   newforms nf(n,verbose); 
   int noldap=25; // stopp0 must be at least this big!
   if (stopp0<noldap) stopp0=noldap;
diff --git a/progs/pcurve.cc b/progs/pcurve.cc
index 0f41684..0993759 100644
--- a/progs/pcurve.cc
+++ b/progs/pcurve.cc
@@ -96,9 +96,6 @@ int main(void)
 // flags to say that we have real/imag period 
 //          and that we have a cycle giving both together
      int rp_known=0, have_both=0;
-     long lplus=nfi->lplus, mplus=nfi->mplus;
-     long s = nfi->sfe;
-     //nfi->dotplus=1;     
      nfi->dotminus=1;  // In case wrong values were on the file!
 
 // STEP 1: find the real period using L(f,1) is L/P nonzero,