diff --git a/src/base/basicOps.nim b/src/base/basicOps.nim
index af0fc96..5498451 100644
--- a/src/base/basicOps.nim
+++ b/src/base/basicOps.nim
@@ -256,6 +256,7 @@ template setUnopT*(op,fun,t1,t2: untyped) {.dirty.} =
     rSetUnopT
 
 template setBinopP*(op,fun,t1,t2,t3: untyped) {.dirty.} =
+  getOptimPragmas()
   #template op*(x: typedesc[t1]; y: typedesc[t2]): typedesc = t3
   proc op*(x: t1; y: t2): auto {.alwaysInline,noInit.} =
     var r{.noInit.}: t3
diff --git a/src/base/profile.nim b/src/base/profile.nim
index 7197cbf..f577bec 100644
--- a/src/base/profile.nim
+++ b/src/base/profile.nim
@@ -822,7 +822,7 @@ proc makeHotspotTable(lrti: List[RTInfoObj]): tuple[ns:int64,oh:int64] =
           t.children.add ri.children[i]
     do: # loc not found
       hs[loc] = ri
-    let tot = makeHotSpotTable(List[RTInfoObj](ri.children))
+    #let tot = makeHotSpotTable(List[RTInfoObj](ri.children))
   return (nstot, ohtot)
 
 proc echoHotspots* =
diff --git a/src/examples/heatbath2dclockt.nim b/src/examples/heatbath2dclockt.nim
index ed7d8cb..ba7997f 100644
--- a/src/examples/heatbath2dclockt.nim
+++ b/src/examples/heatbath2dclockt.nim
@@ -2,7 +2,7 @@ import qex
 import gauge, physics/qcdTypes
 import os, strutils, times
 
-proc sumEnergy(fr,fi:any, J, h:any, g:any, p:seq[float], sf,sb:any) =
+proc sumEnergy(fr,fi:auto, J, h:auto, g:auto, p:seq[float], sf,sb:auto) =
   fr := 0
   fi := 0
   for nu in 0..<g.l.nDim:
@@ -48,7 +48,7 @@ type PhaseDiff[F,E] = object
   cosd,sind:seq[float]
   f: seq[Shifter[F,E]]
 
-proc phaseDiff(del:var PhaseDiff,g:any,p:seq[float],tdir:seq[bool]):auto =
+proc phaseDiff(del:var PhaseDiff,g:auto,p:seq[float],tdir:seq[bool]):auto =
   let
     # del cannot be captured by nim in threads
     f = del.f
@@ -79,7 +79,7 @@ type HeatBath[F,E] = object
   subs: array[2,Subset]
   del: PhaseDiff[F,E]
 
-proc newHeatBath(lo:any):auto =
+proc newHeatBath(lo:auto):auto =
   let
     nd = lo.nDim
     fr = lo.Real
@@ -104,7 +104,7 @@ proc newHeatBath(lo:any):auto =
     r.del.f[i] = newShifter(fr, i, 1)
   r
 
-proc evolve(H:HeatBath, g:any, d:var seq[float], tdir:seq[bool], gc:any, r:any, R:var RngMilc6,
+proc evolve(H:HeatBath, g:auto, d:var seq[float], tdir:seq[bool], gc:auto, r:auto, R:var RngMilc6,
     sample = true, twistSample = true) =
   tic("heatbath")
   let
@@ -146,7 +146,7 @@ proc evolve(H:HeatBath, g:any, d:var seq[float], tdir:seq[bool], gc:any, r:any,
     toc("twist sample")
   toc("end")
 
-proc magnet(g:any):auto =
+proc magnet(g:auto):auto =
   tic("magnet")
   var mr,mi = 0.0
   threads:
diff --git a/src/examples/heatbath2dclocktb.nim b/src/examples/heatbath2dclocktb.nim
index 1bc08de..75e583d 100644
--- a/src/examples/heatbath2dclocktb.nim
+++ b/src/examples/heatbath2dclocktb.nim
@@ -7,7 +7,7 @@ const
   twistBoundaryIndex = 0
   NMax = 8
 
-proc sumEnergy(fr,fi:any, J, h:any, g,b:any, bb,sf,sb:any) =
+proc sumEnergy(fr,fi:auto, J, h:auto, g,b:auto, bb,sf,sb:auto) =
   fr := 0
   fi := 0
   for nu in 0..<g.l.nDim:
@@ -54,7 +54,7 @@ type PhaseDiff[F,E] = object
   cosd,sind:seq[float]
   f: seq[Shifter[F,E]]
 
-proc phaseDiffB(del:var PhaseDiff,g:any):auto =
+proc phaseDiffB(del:var PhaseDiff,g:auto):auto =
   let
     # del cannot be captured by nim in threads
     f = del.f
@@ -75,7 +75,7 @@ proc phaseDiffB(del:var PhaseDiff,g:any):auto =
       cosd[twistDir] = t
       sind[twistDir] = s
 
-proc phaseDiff(del:var PhaseDiff,g,b:any):auto =
+proc phaseDiff(del:var PhaseDiff,g,b:auto):auto =
   let
     # del cannot be captured by nim in threads
     f = del.f
@@ -107,7 +107,7 @@ type HeatBath[F,E] = object
   subs: array[2,Subset]
   del: PhaseDiff[F,E]
 
-proc newHeatBath(lo:any):auto =
+proc newHeatBath(lo:auto):auto =
   let
     nd = lo.nDim
     fr = lo.Real
@@ -132,7 +132,7 @@ proc newHeatBath(lo:any):auto =
     r.del.f[i] = newShifter(fr, i, 1)
   r
 
-proc evolve(H:HeatBath, g,b:any, bb:any, d:var float, gc:any, r:any, R:var RngMilc6,
+proc evolve(H:HeatBath, g,b:auto, bb:auto, d:var float, gc:auto, r:auto, R:var RngMilc6,
     sample = true, twistSample = true) =
   tic("heatbath")
   let
@@ -179,7 +179,7 @@ proc evolve(H:HeatBath, g,b:any, bb:any, d:var float, gc:any, r:any, R:var RngMi
     toc("twist sample")
   toc("end")
 
-proc magnet(g:any):auto =
+proc magnet(g:auto):auto =
   tic("magnet")
   var mr,mi = 0.0
   threads:
diff --git a/src/examples/heatbath2dxy.nim b/src/examples/heatbath2dxy.nim
index 223b950..b14a9b9 100644
--- a/src/examples/heatbath2dxy.nim
+++ b/src/examples/heatbath2dxy.nim
@@ -2,7 +2,7 @@ import qex
 import gauge, physics/qcdTypes
 import os, strutils, times
 
-proc sumEnergy(fr,fi:any, J, h:any, g:any, sf,sb:any) =
+proc sumEnergy(fr,fi:auto, J, h:auto, g:auto, sf,sb:auto) =
   fr := 0
   fi := 0
   for nu in 0..<g.l.nDim:
@@ -21,7 +21,7 @@ type HeatBath[F,E] = object
   sf,sb: array[2,seq[Shifter[F,E]]]
   subs: array[2,Subset]
 
-proc newHeatBath(lo:any):auto =
+proc newHeatBath(lo:auto):auto =
   let
     fr = lo.Real
     fi = lo.Real
@@ -40,7 +40,7 @@ proc newHeatBath(lo:any):auto =
   r.subs[1].layoutSubset(lo,"o")
   r
 
-proc evolve(H:HeatBath, g:any, gc:any, r:any, sample = true, jump = true) =
+proc evolve(H:HeatBath, g:auto, gc:auto, r:auto, sample = true, jump = true) =
   tic("heatbath")
   let
     lo = g.l
@@ -83,7 +83,7 @@ proc evolve(H:HeatBath, g:any, gc:any, r:any, sample = true, jump = true) =
       toc("flip")
   toc("end")
 
-proc magnet(g:any):auto =
+proc magnet(g:auto):auto =
   tic("magnet")
   var mr,mi = 0.0
   threads:
@@ -106,7 +106,7 @@ type PhaseDiff[F,E] = object
   cosd,sind:seq[float]
   f: seq[Shifter[F,E]]
 
-proc newPhaseDiff(g:any):auto =
+proc newPhaseDiff(g:auto):auto =
   type
     F = typeof(g)
     E = typeof(g[0])
@@ -119,7 +119,7 @@ proc newPhaseDiff(g:any):auto =
     r.f[i] = newShifter(g, i, 1)
   r
 
-proc phaseDiff(del:var PhaseDiff,g:any):auto =
+proc phaseDiff(del:var PhaseDiff,g:auto):auto =
   let
     # del cannot be captured by nim in threads
     f = del.f
diff --git a/src/examples/heatbath2dxyp.nim b/src/examples/heatbath2dxyp.nim
index edf3e54..22f5a9c 100644
--- a/src/examples/heatbath2dxyp.nim
+++ b/src/examples/heatbath2dxyp.nim
@@ -7,7 +7,7 @@ template debugPut(n:untyped) =
   when QEXDEBUG:
     echo asttostr(n),": ",n
 
-proc sumEnergy(fr,fi:any, J, h:any, g:any, sf,sb:any) =
+proc sumEnergy(fr,fi:auto, J, h:auto, g:auto, sf,sb:auto) =
   fr := 0
   fi := 0
   for nu in 0..<g.l.nDim:
@@ -394,7 +394,7 @@ proc pickRootCosCosN[D](rng:var RNG, x, phi, sigma:D): auto =
     let r = int(floor(n * rng.uniform))
     return ccn.xs[r]
 
-proc probZN(ss:var openarray[float], g:any, betah:float) =
+proc probZN(ss:var openarray[float], g:auto, betah:float) =
   let
     n = globalP.n
     pidn = globalP.pidn
@@ -419,7 +419,7 @@ type HeatBath[F,E] = object
   sf,sb: array[2,seq[Shifter[F,E]]]
   subs: array[2,Subset]
 
-proc newHeatBath(lo:any):auto =
+proc newHeatBath(lo:auto):auto =
   let
     fr = lo.Real
     fi = lo.Real
@@ -438,7 +438,7 @@ proc newHeatBath(lo:any):auto =
   r.subs[1].layoutSubset(lo,"o")
   r
 
-proc evolve(H:HeatBath, g:any, gc:any, r:any, R:var RngMilc6, sample = true, jump = true, jumpZN = true) =
+proc evolve(H:HeatBath, g:auto, gc:auto, r:auto, R:var RngMilc6, sample = true, jump = true, jumpZN = true) =
   tic("heatbath")
   let
     lo = g.l
@@ -503,7 +503,7 @@ proc evolve(H:HeatBath, g:any, gc:any, r:any, R:var RngMilc6, sample = true, jum
     toc("tryZN")
   toc("end")
 
-proc magnet(g:any):auto =
+proc magnet(g:auto):auto =
   tic("magnet")
   var mr,mi = 0.0
   threads:
@@ -522,7 +522,7 @@ proc magnet(g:any):auto =
   toc("done")
   (mr, mi)
 
-proc magnet(g:any,k:int):auto =
+proc magnet(g:auto,k:int):auto =
   tic("magnetK")
   let d = 2.0*globalP.pidn*k
   var mr,mi = 0.0
@@ -547,7 +547,7 @@ type PhaseDiff[F,E] = object
   cosd,sind:seq[float]
   f: seq[Shifter[F,E]]
 
-proc newPhaseDiff(g:any):auto =
+proc newPhaseDiff(g:auto):auto =
   type
     F = typeof(g)
     E = typeof(g[0])
@@ -560,7 +560,7 @@ proc newPhaseDiff(g:any):auto =
     r.f[i] = newShifter(g, i, 1)
   r
 
-proc phaseDiff(del:var PhaseDiff,g:any):auto =
+proc phaseDiff(del:var PhaseDiff,g:auto):auto =
   let
     # del cannot be captured by nim in threads
     f = del.f
@@ -584,7 +584,7 @@ proc phaseDiff(del:var PhaseDiff,g:any):auto =
         cosd[nu] = v
         sind[nu] = u
 
-proc showMeasure[F,E](del:var PhaseDiff[F,E],g:F,gc:any,label="") =
+proc showMeasure[F,E](del:var PhaseDiff[F,E],g:F,gc:auto,label="") =
   let
     (beta, J, h, hn) = gc
     (mr,mi) = g.magnet
diff --git a/src/examples/heatbath2dxypt.nim b/src/examples/heatbath2dxypt.nim
index 9332f35..2c192dd 100644
--- a/src/examples/heatbath2dxypt.nim
+++ b/src/examples/heatbath2dxypt.nim
@@ -653,7 +653,7 @@ if twistAngle.len != twistDirs.len:
 let
   gc = (beta:beta, J:J, h:h, hn:hn)
   lo = lat.newLayout
-  vol = lo.physVol
+  #vol = lo.physVol
 
 var
   r = lo.newRNGField(RngMilc6, seed)
diff --git a/src/examples/heatbath2dxyptb.nim b/src/examples/heatbath2dxyptb.nim
index c2b03fc..55fb5b5 100644
--- a/src/examples/heatbath2dxyptb.nim
+++ b/src/examples/heatbath2dxyptb.nim
@@ -4,15 +4,15 @@ import os, strutils, times
 
 const twistDir = 0
 
-proc isTwistBoundaryOf(i:int, b:any):bool = b.l.coords[twistDir][i] == 0
+proc isTwistBoundaryOf(i:int, b:auto):bool = b.l.coords[twistDir][i] == 0
 
-proc updateBoundary(b:any, d:any) =
+proc updateBoundary(b:auto, d:auto) =
   threads:
     for i in b.sites:
       if i.isTwistBoundaryOf b:
         b{i} := d
 
-proc sumEnergy(fr,fi:any, J, h:any, g,b:any, bb,sf,sb:any) =
+proc sumEnergy(fr,fi:auto, J, h:auto, g,b:auto, bb,sf,sb:auto) =
   fr := 0
   fi := 0
   for nu in 0..<g.l.nDim:
@@ -400,7 +400,7 @@ type PhaseDiff[F,E] = object
   cosd,sind:seq[float]
   f: seq[Shifter[F,E]]
 
-proc phaseDiffB(del:var PhaseDiff,g:any):auto =
+proc phaseDiffB(del:var PhaseDiff,g:auto):auto =
   let
     # del cannot be captured by nim in threads
     f = del.f
@@ -421,7 +421,7 @@ proc phaseDiffB(del:var PhaseDiff,g:any):auto =
       cosd[twistDir] = t
       sind[twistDir] = s
 
-proc phaseDiff(del:var PhaseDiff,g,b:any):auto =
+proc phaseDiff(del:var PhaseDiff,g,b:auto):auto =
   let
     # del cannot be captured by nim in threads
     f = del.f
@@ -453,7 +453,7 @@ type HeatBath[F,E] = object
   subs: array[2,Subset]
   del: PhaseDiff[F,E]
 
-proc newHeatBath(lo:any):auto =
+proc newHeatBath(lo:auto):auto =
   let
     nd = lo.nDim
     fr = lo.Real
@@ -478,7 +478,7 @@ proc newHeatBath(lo:any):auto =
     r.del.f[i] = newShifter(fr, i, 1)
   r
 
-proc evolve(H:HeatBath, g,b:any, bb:any, d:var float, gc:any, r:any, R:var RngMilc6,
+proc evolve(H:HeatBath, g,b:auto, bb:auto, d:var float, gc:auto, r:auto, R:var RngMilc6,
     sample = true, twistSample = true, jump = true, twistJump = true) =
   tic("heatbath")
   let
@@ -552,7 +552,7 @@ proc evolve(H:HeatBath, g,b:any, bb:any, d:var float, gc:any, r:any, R:var RngMi
     toc("twist flip")
   toc("end")
 
-proc magnet(g:any):auto =
+proc magnet(g:auto):auto =
   tic("magnet")
   var mr,mi = 0.0
   threads:
diff --git a/src/examples/heatbath2dxyt.nim b/src/examples/heatbath2dxyt.nim
index 516733b..49087dc 100644
--- a/src/examples/heatbath2dxyt.nim
+++ b/src/examples/heatbath2dxyt.nim
@@ -2,7 +2,7 @@ import qex
 import gauge, physics/qcdTypes
 import os, strutils, times
 
-proc sumEnergy(fr,fi:any, J, h:any, g:any, p:seq[float], sf,sb:any) =
+proc sumEnergy(fr,fi:auto, J, h:auto, g:auto, p:seq[float], sf,sb:auto) =
   fr := 0
   fi := 0
   for nu in 0..<g.l.nDim:
@@ -26,7 +26,7 @@ type PhaseDiff[F,E] = object
   cosd,sind:seq[float]
   f: seq[Shifter[F,E]]
 
-proc phaseDiff(del:var PhaseDiff,g:any,p:seq[float],tdir:seq[bool]):auto =
+proc phaseDiff(del:var PhaseDiff,g:auto,p:seq[float],tdir:seq[bool]):auto =
   let
     # del cannot be captured by nim in threads
     f = del.f
@@ -57,7 +57,7 @@ type HeatBath[F,E] = object
   subs: array[2,Subset]
   del: PhaseDiff[F,E]
 
-proc newHeatBath(lo:any):auto =
+proc newHeatBath(lo:auto):auto =
   let
     nd = lo.nDim
     fr = lo.Real
@@ -82,7 +82,7 @@ proc newHeatBath(lo:any):auto =
     r.del.f[i] = newShifter(fr, i, 1)
   r
 
-proc evolve(H:HeatBath, g:any, d:var seq[float], tdir:seq[bool], gc:any, r:any, R:var RngMilc6,
+proc evolve(H:HeatBath, g:auto, d:var seq[float], tdir:seq[bool], gc:auto, r:auto, R:var RngMilc6,
     sample = true, twistSample = true, jump = true, twistJump = true) =
   tic("heatbath")
   let
@@ -152,7 +152,7 @@ proc evolve(H:HeatBath, g:any, d:var seq[float], tdir:seq[bool], gc:any, r:any,
     toc("twist flip")
   toc("end")
 
-proc magnet(g:any):auto =
+proc magnet(g:auto):auto =
   tic("magnet")
   var mr,mi = 0.0
   threads:
diff --git a/src/examples/heatbath2dxytb.nim b/src/examples/heatbath2dxytb.nim
index 4a92558..c1ab940 100644
--- a/src/examples/heatbath2dxytb.nim
+++ b/src/examples/heatbath2dxytb.nim
@@ -4,15 +4,15 @@ import os, strutils, times
 
 const twistDir = 0
 
-proc isTwistBoundaryOf(i:int, b:any):bool = b.l.coords[twistDir][i] == 0
+proc isTwistBoundaryOf(i:int, b:auto):bool = b.l.coords[twistDir][i] == 0
 
-proc updateBoundary(b:any, d:any) =
+proc updateBoundary(b:auto, d:auto) =
   threads:
     for i in b.sites:
       if i.isTwistBoundaryOf b:
         b{i} := d
 
-proc sumEnergy(fr,fi:any, J, h:any, g,b:any, bb,sf,sb:any) =
+proc sumEnergy(fr,fi:auto, J, h:auto, g,b:auto, bb,sf,sb:auto) =
   fr := 0
   fi := 0
   for nu in 0..<g.l.nDim:
@@ -39,7 +39,7 @@ type PhaseDiff[F,E] = object
   cosd,sind:seq[float]
   f: seq[Shifter[F,E]]
 
-proc phaseDiffB(del:var PhaseDiff,g:any):auto =
+proc phaseDiffB(del:var PhaseDiff,g:auto):auto =
   let
     # del cannot be captured by nim in threads
     f = del.f
@@ -60,7 +60,7 @@ proc phaseDiffB(del:var PhaseDiff,g:any):auto =
       cosd[twistDir] = t
       sind[twistDir] = s
 
-proc phaseDiff(del:var PhaseDiff,g,b:any):auto =
+proc phaseDiff(del:var PhaseDiff,g,b:auto):auto =
   let
     # del cannot be captured by nim in threads
     f = del.f
@@ -92,7 +92,7 @@ type HeatBath[F,E] = object
   subs: array[2,Subset]
   del: PhaseDiff[F,E]
 
-proc newHeatBath(lo:any):auto =
+proc newHeatBath(lo:auto):auto =
   let
     nd = lo.nDim
     fr = lo.Real
@@ -117,7 +117,7 @@ proc newHeatBath(lo:any):auto =
     r.del.f[i] = newShifter(fr, i, 1)
   r
 
-proc evolve(H:HeatBath, g,b:any, bb:any, d:var float, gc:any, r:any, R:var RngMilc6,
+proc evolve(H:HeatBath, g,b:auto, bb:auto, d:var float, gc:auto, r:auto, R:var RngMilc6,
     sample = true, twistSample = true, jump = true, twistJump = true) =
   tic("heatbath")
   let
@@ -188,7 +188,7 @@ proc evolve(H:HeatBath, g,b:any, bb:any, d:var float, gc:any, r:any, R:var RngMi
     toc("twist flip")
   toc("end")
 
-proc magnet(g:any):auto =
+proc magnet(g:auto):auto =
   tic("magnet")
   var mr,mi = 0.0
   threads:
diff --git a/src/examples/modeigs1.nim b/src/examples/modeigs1.nim
index 865a68e..d2d0bc7 100644
--- a/src/examples/modeigs1.nim
+++ b/src/examples/modeigs1.nim
@@ -1,6 +1,6 @@
 import qex
 import io / [parallelIo, timesliceIo, modfile]
-import xmlparser, xmltree, strutils, sequtils, endians, times
+import xmltree, strutils, times
 
 template TAG(x: untyped): untyped = xmltree.`<>`(x)
 template TXT(x: untyped): untyped = xmltree.newText(x)
diff --git a/src/examples/staghmc.nim b/src/examples/staghmc.nim
index dc1746e..d040e46 100644
--- a/src/examples/staghmc.nim
+++ b/src/examples/staghmc.nim
@@ -134,9 +134,9 @@ proc mdvf(t: float) =
       p[mu] -= s*f[mu]
   toc("mdvf")
 
-proc mdvf2(t: float) =
-  mdv(t)
-  mdvf(t)
+#proc mdvf2(t: float) =
+#  mdv(t)
+#  mdvf(t)
 
 # For force gradient update
 #const useFG = true
@@ -175,7 +175,7 @@ proc mdvAll(t: openarray[float]) =
   # For now, just do it separately.
   if t[0] != 0: mdv t[0]
   if t[1] != 0: mdvf t[1]
-proc mdvAllfga(ts,gs:openarray[float]) =
+proc mdvAllfga(ts,gs:openarray[float]) {.used.} =
   # TODO: actually share computation.
   # For now, just do it separately.
   let
diff --git a/src/examples/staghmc_h.nim b/src/examples/staghmc_h.nim
index 2643c1a..8af3801 100644
--- a/src/examples/staghmc_h.nim
+++ b/src/examples/staghmc_h.nim
@@ -80,7 +80,7 @@ template pnorm2(p2:float) =
     threadMaster: p2 = p2t
     g.rephase
 
-proc gaction(g:any, f2:seq[float], p2:float):auto =
+proc gaction(g:auto, f2:seq[float], p2:float):auto =
   let
     ga = gc.actionA g
     fa = f2.mapit(0.5*it)
@@ -100,14 +100,14 @@ template faction(fa:seq[float]) =
       threadMaster: fa[i] = psi2
     g.rephase
 
-proc olf(f: var any, v1: any, v2: any) =
+proc olf(f: var auto, v1: auto, v2: auto) =
   var t {.noInit.}: type(f)
   for i in 0..<v1.len:
     for j in 0..<v2.len:
       t[i,j] := v1[i] * v2[j].adj
   projectTAH(f, t)
 
-proc oneLinkForce(f: any, p: any, g: any) =
+proc oneLinkForce(f: auto, p: auto, g: auto) =
   let t = newTransporters(g, p, 1)
   for mu in 0..<g.len:
     discard t[mu] ^* p
@@ -117,7 +117,7 @@ proc oneLinkForce(f: any, p: any, g: any) =
     for i in f[mu].odd:
       f[mu][i] *= -1
 
-proc fforce(f: any, i: int) =
+proc fforce(f: auto, i: int) =
   tic()
   threads:
     g.rephase
diff --git a/src/examples/staghmc_s.nim b/src/examples/staghmc_s.nim
index a378317..b913db5 100644
--- a/src/examples/staghmc_s.nim
+++ b/src/examples/staghmc_s.nim
@@ -79,7 +79,7 @@ echo "smear = ",coef
 var sg = lo.newGauge
 let stag = newStag(sg)
 
-proc smearRephase(g: any, sg: any):auto {.discardable.} =
+proc smearRephase(g: auto, sg: auto):auto {.discardable.} =
   tic()
   #let smearedForce = coef.smear(g, sg, info)
   let smearedForce = coef.smearGetForce(g, sg, info)
@@ -91,7 +91,7 @@ proc smearRephase(g: any, sg: any):auto {.discardable.} =
   toc("BC & Phase")
   smearedForce
 
-proc smearedOneLinkForce(f: any, smearedForce: proc, p: any, g:any) =
+proc smearedOneLinkForce(f: auto, smearedForce: proc, p: auto, g:auto) =
   # reverse accumulation of the derivative
   # 1. Dslash
   var t: array[4,Shifter[typeof(p), typeof(p[0])]]
@@ -127,7 +127,7 @@ proc smearedOneLinkForce(f: any, smearedForce: proc, p: any, g:any) =
         s := f[mu][i] * g[mu][i].adj
         projectTAH(f[mu][i], s)
 
-proc fforce(f: any) =
+proc fforce(f: auto) =
   tic()
   let smearedForce = g.smearRephase sg
   toc("fforce smear rephase")
diff --git a/src/io/modfile.nim b/src/io/modfile.nim
index c822b4a..f5ed2ce 100644
--- a/src/io/modfile.nim
+++ b/src/io/modfile.nim
@@ -1,5 +1,5 @@
 import parallelIo
-import endians, tables, strutils
+import tables
 
 proc modReadString(pr: var ParallelReader): string =
   var bytes = pr.readBigInt32()
@@ -28,7 +28,7 @@ proc modReadHeader*(pr: var ParallelReader): ModFileHeader =
   result.magic = pr.modReadString()
   result.version = pr.readBigInt32()
   result.userdata = pr.modReadString()
-  var dum = pr.readBigInt64()
+  discard pr.readBigInt64()
   result.mapstart = pr.readBigInt64().int
   #echo result
 
@@ -59,17 +59,17 @@ proc modReadMap*(pr: var ParallelReader, mdstart: int): ModFileMap =
   #echo num
   for i in 0..<num:
     let k = pr.modReadString()
-    var dum = pr.readBigInt64()
+    discard pr.readBigInt64()
     let v = pr.readBigInt64().int
     #echo k.toHex()
     #echo i, ": ", v
-    result.add(k, v)
+    result[k] = v
   pr.endLocalChecksum()
   let cks = pr.readBigInt32().uint32
   #echo "cksum: ", cks, "  ", pr.crc32
   doAssert(cks == pr.crc32)
 
-proc getPos*(m: ModFileMap, x: any): int =
+proc getPos*(m: ModFileMap, x: auto): int =
   let l = sizeof(x)
   var s = newString(l)
   copyMem(s[0].addr, unsafeAddr(x), l)
diff --git a/src/physics/wilsonD.nim b/src/physics/wilsonD.nim
index 49b642c..d5890f7 100644
--- a/src/physics/wilsonD.nim
+++ b/src/physics/wilsonD.nim
@@ -448,21 +448,21 @@ proc solve2*(s:Wilson; r,x:Field; m:SomeNumber; res2:float) =
     threadBarrier()
     r := t
 
-template foldl(f,n,op:untyped):untyped =
-  var r:type(f(0))
-  r = f(0)
-  for i in 1..<n:
-    let
-      a {.inject.} = r
-      b {.inject.} = f(i)
-    r = op
-  r
-
 static:
   echo "Finished wilsonD: ", staticExec("date")
 
 when isMainModule:
   import rng
+  template foldl(f,n,op:untyped):untyped =
+    var r:type(f(0))
+    r = f(0)
+    for i in 1..<n:
+      let
+        a {.inject.} = r
+        b {.inject.} = f(i)
+      r = op
+    r
+
   proc runtest(v1,v2,sdAll,sdEven,sdOdd,s,m:any) =
     let g = s.g
     let lo = g[0].l