diff --git a/drawing.cpp b/drawing.cpp
index e04bd10b..cf1ede9b 100644
--- a/drawing.cpp
+++ b/drawing.cpp
@@ -87,7 +87,7 @@ struct dqi_poly : drawqueueitem {
   flagtype flags;
   /** \brief Texture data for textured polygons. Requires POLY_TRIANGLES flag */
   struct basic_textureinfo *tinf;
-  /** \brief used to find the correct side to draw in spherical geometries */
+  /** \brief used to find the correct side to draw in spherical geometries, and also to sort sidewalls */
   hyperpoint intester;
   /** \brief temporarily cached data */
   float cache;
@@ -2618,7 +2618,7 @@ EX void drawqueue() {
     if(qp0[pp] == qp[pp]) continue;
     for(int i=qp0[pp]; i<qp[pp]; i++) {
       auto& ap = (dqi_poly&) *ptds[i];
-      ap.cache = xintval(ap.V * xpush0(.1));
+      ap.cache = xintval(ap.V * ap.intester);
       }
     sort(&ptds[qp0[pp]], &ptds[qp[pp]], 
       [] (const unique_ptr<drawqueueitem>& p1, const unique_ptr<drawqueueitem>& p2) {
diff --git a/floorshapes.cpp b/floorshapes.cpp
index 547c94c7..2626f436 100644
--- a/floorshapes.cpp
+++ b/floorshapes.cpp
@@ -320,16 +320,14 @@ void geometry_information::bshape_regular(floorshape &fsh, int id, int sides, ld
       }
     
     for(auto p: allsides) {
-      if(isize(fsh.gpside[p]) < c->type)
-        fsh.gpside[p].resize(c->type);
       for(int i=0; i<c->type; i++) {
-        sizeto(fsh.gpside[p][i], id);
-        bshape(fsh.gpside[p][i][id], PPR::FLOOR_SIDE);
+        sizeto(fsh.side[p][i], id);
+        bshape(fsh.side[p][i][id], PPR::FLOOR_SIDE);
         hyperpoint h0 = bt::get_corner_horo_coordinates(c, i) * size;
         hyperpoint h1 = bt::get_corner_horo_coordinates(c, i+1) * size;
         hyperpoint hd = (h1 - h0) / STEP;
         for(int j=0; j<=STEP; j++)
-          hpcpush(iddspin_side(c, i) * bt::get_horopoint(h0 + hd * j));
+          hpcpush(bt::get_horopoint(h0 + hd * j));
         chasmifyPoly(dlow_table[p], dhi_table[p], p);
         }
       }
@@ -347,21 +345,13 @@ void geometry_information::bshape_regular(floorshape &fsh, int id, int sides, ld
     hpcpush(xspinpush0(t * TAU / sides + shift * S_step, size * SHADMUL));
 
   for(auto p: allsides) {
-    fsh.side[p].resize(2);
-    bshape(fsh.side[p][id], PPR::FLOOR_SIDE);
-    hpcpush(xspinpush0(+M_PI/sides, size));
-    hpcpush(xspinpush0(-M_PI/sides, size));
-    chasmifyPoly(dlow_table[p], dhi_table[p], p);
-
-    if(cgi.emb->is_euc_in_noniso()) {
-      fsh.gpside[p].resize(c->type);
-      for(int i=0; i<c->type; i++) {
-        sizeto(fsh.gpside[p][i], id);
-        bshape(fsh.gpside[p][i][id], PPR::FLOOR_SIDE);
-        hpcpush(xspinpush0(M_PI - i * TAU / sides + shift * S_step, size));
-        hpcpush(xspinpush0(M_PI - (i + 1) * TAU / sides + shift * S_step, size));
-        chasmifyPoly(dlow_table[p], dhi_table[p], p);
-        }
+    fsh.side[p].resize(c->type);
+    for(int i=0; i<c->type; i++) {
+      sizeto(fsh.side[p][i], id);
+      bshape(fsh.side[p][i][id], PPR::FLOOR_SIDE);
+      hpcpush(xspinpush0(- i * TAU / sides + shift * S_step, size));
+      hpcpush(xspinpush0(- (i+1) * TAU / sides + shift * S_step, size));
+      chasmifyPoly(dlow_table[p], dhi_table[p], p);
       }
     }
   }
@@ -416,10 +406,10 @@ void geometry_information::generate_floorshapes_for(int id, cell *c, int siid, i
 
       ld hexside = fsh.rad0, heptside = fsh.rad1;
       
-      for(auto p: allsides) sizeto(fsh.side[p], id);
-      
       ld td = (PURE && !(S7&1)) ? S42+S6 : 0;
       if(&fsh == &shBigHepta) td += S6;
+
+      if(dont_inverse()) td += S42;
       
       if(S3 >= OINF && !(S7 & 1)) td = S42 * 1. / S7;
     
@@ -595,13 +585,13 @@ void geometry_information::generate_floorshapes_for(int id, cell *c, int siid, i
       hpcpush(mid_at(hpxy(0,0), cornerlist[i%cor], SHADMUL));
     
     for(auto p: allsides) {
-      if(isize(fsh.gpside[p]) < cor)
-        fsh.gpside[p].resize(cor);
+      if(isize(fsh.side[p]) < cor)
+        fsh.side[p].resize(cor);
       for(int cid=0; cid<cor; cid++) {
-        sizeto(fsh.gpside[p][cid], id);
-        bshape(fsh.gpside[p][cid][id], fsh.prio);
-        hpcpush(iddspin_side(c, cid) * cornerlist[cid]);
-        hpcpush(iddspin_side(c, cid) * cornerlist[(cid+1)%cor]);
+        sizeto(fsh.side[p][cid], id);
+        bshape(fsh.side[p][cid][id], fsh.prio);
+        hpcpush(cornerlist[cid]);
+        hpcpush(cornerlist[(cid+1)%cor]);
         chasmifyPoly(dlow_table[p], dhi_table[p], p);
         }
       }
@@ -791,11 +781,8 @@ void geometry_information::generate_floorshapes_for(int id, cell *c, int siid, i
         }
 
       for(auto p: allsides) {
-        for(auto& li: fsh.side[p]) 
-          bind_floor_texture(li, fsh.id);
-        if(isize(fsh.gpside[p]) < c->type)
-          fsh.gpside[p].resize(c->type);
-        for(auto& gs: fsh.gpside[p]) {
+        sizeto(fsh.side[p], c->type);
+        for(auto& gs: fsh.side[p]) {
           for(auto& li: gs) 
             bind_floor_texture(li, fsh.id);
           }
@@ -809,13 +796,10 @@ void geometry_information::generate_floorshapes_for(int id, cell *c, int siid, i
         fsh.levels[p] = shFullFloor.levels[p];
         fsh.shadow = shFullFloor.shadow;
         for(auto& li: fsh.levels[p]) bind_floor_texture(li, fsh.id);
-        fsh.side[p] = shFullFloor.side[p];
-        for(auto& li: fsh.side[p]) bind_floor_texture(li, fsh.id);
-        if(isize(fsh.gpside[p]) < c->type)
-          fsh.gpside[p].resize(c->type);
+        sizeto(fsh.side[p], c->type);
         for(int e=0; e<c->type; e++) {
-          fsh.gpside[p][e] = shFullFloor.gpside[p][e];
-          for(auto& li: fsh.gpside[p][e])
+          fsh.side[p][e] = shFullFloor.side[p][e];
+          for(auto& li: fsh.side[p][e])
             bind_floor_texture(li, fsh.id);
           }
         fsh.cone[0] = shFullFloor.cone[0];
diff --git a/geometry.cpp b/geometry.cpp
index 204ccc4b..b7fdb04d 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -94,8 +94,8 @@ struct floorshape {
   int fstrength; // frame strength in 3D
   PPR prio;
   vector<hpcshape> b, shadow, cone[2];
-  sidearray<vector<hpcshape>> side, levels;
-  sidearray<vector<vector<hpcshape>>> gpside;
+  sidearray<vector<hpcshape>> levels;
+  sidearray<vector<vector<hpcshape>>> side;
   floorshape() { prio = PPR::FLOOR; pstrength = fstrength = 10; }
   };
 
diff --git a/graph.cpp b/graph.cpp
index 2b0a3860..36a26794 100644
--- a/graph.cpp
+++ b/graph.cpp
@@ -3934,35 +3934,24 @@ EX bool placeSidewall(cell *c, int i, SIDE sidepar, const shiftmatrix& V, color_
 
   if((col & 255) < 255) prio = PPR::TRANSPARENT_WALL;
   
-  if(cgi.emb->is_in_noniso()) {
-    draw_shapevec(c, V, qfi.fshape->gpside[sidepar][i], col, prio);
-    return false;
-    }
-
   dynamicval<bool> ncor(approx_nearcorner, true);
-  shiftmatrix V2 = V * ddspin_side(c, i);
   
-  if(NONSTDVAR || !standard_tiling()) {
-    #if CAP_ARCM
-    if(arcm::in() && !PURE)
-      i = gmod(i + arcm::parent_index_of(c->master)/DUALMUL, c->type);
-    #endif
-    if(currentmap->strict_tree_rules()) {
-      i = rulegen::get_arb_dir(c, i);
-      }
-    if(int(sidepar) >= SIDEPARS) {
-      println(hlog, "ERROR: sidepar >= SIDEPARS: ", make_pair(int(sidepar), SIDEPARS));
-      return false;
-      }
-    if(i >= isize(qfi.fshape->gpside[sidepar])) {
-      println(hlog, "ERROR: i >= gpside[sidepar]", make_tuple(int(sidepar), i, isize(qfi.fshape->gpside[sidepar])));
-      return false;
-      }
-    draw_shapevec(c, V2, qfi.fshape->gpside[sidepar][i], col, prio);
+  #if CAP_ARCM
+  if(arcm::in() && !PURE)
+    i = gmod(i + arcm::parent_index_of(c->master)/DUALMUL, c->type);
+  #endif
+  if(currentmap->strict_tree_rules()) {
+    i = rulegen::get_arb_dir(c, i);
+    }
+  if(int(sidepar) >= SIDEPARS) {
+    println(hlog, "ERROR: sidepar >= SIDEPARS: ", make_pair(int(sidepar), SIDEPARS));
     return false;
     }
-  
-  queuepolyat(V2, qfi.fshape->side[sidepar][shvid(c)], col, prio);
+  if(i >= isize(qfi.fshape->side[sidepar])) {
+    println(hlog, "ERROR: i >= side[sidepar]", make_tuple(int(sidepar), i, isize(qfi.fshape->side[sidepar])));
+    return false;
+    }
+  draw_shapevec(c, V, qfi.fshape->side[sidepar][i], col, prio);
   return false;
   }
 #endif
diff --git a/polygons.cpp b/polygons.cpp
index 2395b18d..10c3f364 100644
--- a/polygons.cpp
+++ b/polygons.cpp
@@ -92,12 +92,15 @@ void geometry_information::hpcpush(hyperpoint h) {
 
 void geometry_information::chasmifyPoly(double fol, double fol2, SIDE p) {
   if(GDIM == 2) {
+     hyperpoint tester = Hypc;
      for(int i=isize(hpc)-1; i >= last->s; i--) {
+       tester += hpc[i];
        hpc.push_back(orthogonal_move_fol(hpc[i], fol));
        hpc[i] = orthogonal_move_fol(hpc[i], fol2);
        }
      hpc.push_back(hpc[last->s]);
      last->flags |= POLY_ISSIDE;
+     last->intester = normalize(tester);
      }
   else {
     vector<hyperpoint> points;