diff --git a/rogueviz/fundamental.cpp b/rogueviz/fundamental.cpp
index 41baa02c..3d7e0703 100644
--- a/rogueviz/fundamental.cpp
+++ b/rogueviz/fundamental.cpp
@@ -57,7 +57,7 @@ ld widthfactor = 5;
 ld label_scale = 1;
 
 void fundamental_marker() {
-  if(!funmode || !(quotient || euwrap || elliptic)) return;
+  if(!funmode || !quotient) return;
   same.clear();
   gm.clear();
   
diff --git a/rogueviz/grigorchuk.cpp b/rogueviz/grigorchuk.cpp
index 4463f167..5e29504e 100644
--- a/rogueviz/grigorchuk.cpp
+++ b/rogueviz/grigorchuk.cpp
@@ -400,7 +400,7 @@ struct hrmap_grigorchuk : hrmap_standard {
       }
     }
 
-  transmatrix relative_matrix(heptagon *h2, heptagon *h1) override {
+  transmatrix relative_matrix(heptagon *h2, heptagon *h1, const hyperpoint& hint) override {
     if(gmatrix0.count(h2->c7) && gmatrix0.count(h1->c7))
       return inverse(gmatrix0[h1->c7]) * gmatrix0[h2->c7];
     return Id;
diff --git a/rogueviz/kohonen.cpp b/rogueviz/kohonen.cpp
index b4e56111..44f2e48a 100644
--- a/rogueviz/kohonen.cpp
+++ b/rogueviz/kohonen.cpp
@@ -418,14 +418,14 @@ void buildcellcrawler(cell *c, cellcrawler& cr, int dir) {
 map<int, cellcrawler> scc;
 
 pair<int, int> get_cellcrawler_id(cell *c) {
-  if(among(geometry, gZebraQuotient, gMinimal, gField435, gField534) || (euwrap && !fulltorus) || IRREGULAR || (GDIM == 3 && sphere)) {
+  if(among(geometry, gZebraQuotient, gMinimal, gField435, gField534) || (euclid && quotient && !bounded) || IRREGULAR || (GDIM == 3 && sphere)) {
     // Zebra Quotient does exhibit some symmetries,
     // but these are so small anyway that it is safer to just build
     // a crawler for every neuron
     return make_pair(neuronId(*getNeuronSlow(c)), 0);
     // not yet implemented for cylinder
     }
-  if(fulltorus && (torusconfig::tmflags() & torusconfig::TF_KLEIN))
+  if(euclid && bounded && PURE && nonorientable)
     return make_pair(cell_to_pair(c).second * 2 + ctof(c), 0);
   int id = 0, dir = 0;
 #if CAP_GP
diff --git a/rogueviz/qtm.cpp b/rogueviz/qtm.cpp
index a7cc011a..611771b4 100644
--- a/rogueviz/qtm.cpp
+++ b/rogueviz/qtm.cpp
@@ -34,7 +34,7 @@ color_t rcolor() {
 void set_cell(cell *c) {
   if(hybri) {
     cell *c1 = hybrid::get_where(c).first;
-    if(c1->land != laHive) hybrid::in_underlying_map([&] { set_cell(c1); });
+    if(c1->land != laHive) hybrid::in_underlying_geometry([&] { set_cell(c1); });
     c->land = c1->land;
     c->wall = c1->wall;
     c->landparam = c1->landparam;
diff --git a/rogueviz/rogueviz.cpp b/rogueviz/rogueviz.cpp
index 31db71cd..51473993 100644
--- a/rogueviz/rogueviz.cpp
+++ b/rogueviz/rogueviz.cpp
@@ -1304,7 +1304,7 @@ bool drawVertex(const transmatrix &V, cell *c, shmup::monster *m) {
 
     // if(hilite) ghilite = true;
     
-    bool multidraw = quotient || euwrap;
+    bool multidraw = quotient;
         
     if(ei->lastdraw < frameid || multidraw) { 
       ei->lastdraw = frameid;