diff --git a/technology/scn4m_subm/mag_lib/cell_1rw_1r.mag b/technology/scn4m_subm/mag_lib/cell_1rw_1r.mag
index 0f2cdadb..0484df70 100644
--- a/technology/scn4m_subm/mag_lib/cell_1rw_1r.mag
+++ b/technology/scn4m_subm/mag_lib/cell_1rw_1r.mag
@@ -1,31 +1,22 @@
 magic
 tech scmos
-timestamp 1572948731
-<< pwell >>
-rect 0 0 54 46
+timestamp 1577066542
 << nwell >>
 rect 0 46 54 75
-<< polysilicon >>
-rect 22 57 24 60
-rect 30 57 32 60
-rect 22 44 24 54
-rect 30 51 32 54
-rect 31 47 32 51
-rect 14 37 16 44
-rect 22 40 23 44
-rect 22 37 24 40
-rect 30 37 32 47
-rect 38 37 40 44
-rect 14 31 16 33
-rect 38 31 40 33
-rect 14 23 16 24
-rect 22 23 24 29
-rect 30 23 32 29
-rect 38 23 40 24
-rect 14 15 16 17
-rect 22 15 24 17
-rect 30 15 32 17
-rect 38 15 40 17
+<< pwell >>
+rect 0 0 54 46
+<< ntransistor >>
+rect 14 33 16 37
+rect 22 29 24 37
+rect 30 29 32 37
+rect 38 33 40 37
+rect 14 17 16 23
+rect 22 17 24 23
+rect 30 17 32 23
+rect 38 17 40 23
+<< ptransistor >>
+rect 22 54 24 57
+rect 30 54 32 57
 << ndiffusion >>
 rect 13 33 14 37
 rect 16 33 17 37
@@ -50,6 +41,51 @@ rect 21 54 22 57
 rect 24 54 25 57
 rect 29 54 30 57
 rect 32 54 33 57
+<< ndcontact >>
+rect 9 33 13 37
+rect 17 33 21 37
+rect 25 29 29 37
+rect 33 33 37 37
+rect 41 33 45 37
+rect 9 17 13 21
+rect 25 17 29 23
+rect 41 17 45 21
+<< pdcontact >>
+rect 17 54 21 58
+rect 25 54 29 58
+rect 33 54 37 58
+<< psubstratepcontact >>
+rect 25 9 29 13
+<< nsubstratencontact >>
+rect 25 68 29 72
+<< polysilicon >>
+rect 22 57 24 60
+rect 30 57 32 60
+rect 22 44 24 54
+rect 30 51 32 54
+rect 31 47 32 51
+rect 14 37 16 44
+rect 22 40 23 44
+rect 22 37 24 40
+rect 30 37 32 47
+rect 38 37 40 44
+rect 14 31 16 33
+rect 38 31 40 33
+rect 14 23 16 24
+rect 22 23 24 29
+rect 30 23 32 29
+rect 38 23 40 24
+rect 14 15 16 17
+rect 22 15 24 17
+rect 30 15 32 17
+rect 38 15 40 17
+<< polycontact >>
+rect 27 47 31 51
+rect 10 40 14 44
+rect 23 40 27 44
+rect 40 40 44 44
+rect 12 24 16 28
+rect 38 24 42 28
 << metal1 >>
 rect 0 68 25 72
 rect 29 68 54 72
@@ -71,6 +107,17 @@ rect 29 9 54 13
 rect 0 2 16 6
 rect 20 2 34 6
 rect 38 2 54 6
+<< m2contact >>
+rect 25 68 29 72
+rect 25 54 29 58
+rect 2 33 6 37
+rect 48 33 52 37
+rect 16 24 20 28
+rect 34 24 38 28
+rect 9 17 13 21
+rect 41 17 45 21
+rect 16 2 20 6
+rect 34 2 38 6
 << metal2 >>
 rect 2 37 6 72
 rect 2 0 6 33
@@ -80,47 +127,11 @@ rect 9 0 13 17
 rect 16 6 20 24
 rect 34 6 38 24
 rect 41 21 45 72
-rect 48 37 52 72
 rect 41 0 45 17
+rect 48 37 52 72
 rect 48 0 52 33
-<< ntransistor >>
-rect 14 33 16 37
-rect 22 29 24 37
-rect 30 29 32 37
-rect 38 33 40 37
-rect 14 17 16 23
-rect 22 17 24 23
-rect 30 17 32 23
-rect 38 17 40 23
-<< ptransistor >>
-rect 22 54 24 57
-rect 30 54 32 57
-<< polycontact >>
-rect 27 47 31 51
-rect 10 40 14 44
-rect 23 40 27 44
-rect 40 40 44 44
-rect 12 24 16 28
-rect 38 24 42 28
-<< ndcontact >>
-rect 9 33 13 37
-rect 17 33 21 37
-rect 25 29 29 37
-rect 33 33 37 37
-rect 41 33 45 37
-rect 25 17 29 23
-<< pdcontact >>
-rect 17 54 21 58
-rect 33 54 37 58
-<< m2contact >>
-rect 2 33 6 37
-rect 48 33 52 37
-rect 16 24 20 28
-rect 34 24 38 28
-rect 16 2 20 6
-rect 34 2 38 6
-<< psubstratepcontact >>
-rect 25 9 29 13
+<< comment >>
+rect 0 0 54 70
 << labels >>
 rlabel metal1 19 63 19 63 1 wl0
 rlabel metal1 19 70 19 70 5 vdd
@@ -130,6 +141,6 @@ rlabel metal2 4 7 4 7 2 bl0
 rlabel metal2 11 7 11 7 1 bl1
 rlabel metal2 43 7 43 7 1 br1
 rlabel metal2 50 7 50 7 8 br0
-rlabel metal1 19 49 19 49 1 Q
-rlabel metal1 35 42 35 42 1 Q_bar
+rlabel polycontact 29 49 29 49 1 Q
+rlabel polycontact 25 42 25 42 1 Q_bar
 << end >>
diff --git a/technology/scn4m_subm/mag_lib/cell_1w_1r.mag b/technology/scn4m_subm/mag_lib/cell_1w_1r.mag
index 91d06069..71a3b1bc 100644
--- a/technology/scn4m_subm/mag_lib/cell_1w_1r.mag
+++ b/technology/scn4m_subm/mag_lib/cell_1w_1r.mag
@@ -1,31 +1,22 @@
 magic
 tech scmos
-timestamp 1572948787
-<< pwell >>
-rect 0 0 54 46
+timestamp 1577067400
 << nwell >>
 rect 0 46 54 75
-<< polysilicon >>
-rect 22 57 24 60
-rect 30 57 32 60
-rect 22 44 24 54
-rect 30 51 32 54
-rect 31 47 32 51
-rect 14 37 16 44
-rect 22 40 23 44
-rect 22 37 24 40
-rect 30 37 32 47
-rect 38 37 40 44
-rect 14 31 16 33
-rect 38 31 40 33
-rect 14 23 16 24
-rect 22 23 24 29
-rect 30 23 32 29
-rect 38 23 40 24
-rect 14 15 16 17
-rect 22 15 24 17
-rect 30 15 32 17
-rect 38 15 40 17
+<< pwell >>
+rect 0 0 54 46
+<< ntransistor >>
+rect 14 33 16 37
+rect 22 29 24 37
+rect 30 29 32 37
+rect 38 33 40 37
+rect 14 17 16 23
+rect 22 17 24 23
+rect 30 17 32 23
+rect 38 17 40 23
+<< ptransistor >>
+rect 22 54 24 57
+rect 30 54 32 57
 << ndiffusion >>
 rect 13 33 14 37
 rect 16 33 17 37
@@ -50,6 +41,51 @@ rect 21 54 22 57
 rect 24 54 25 57
 rect 29 54 30 57
 rect 32 54 33 57
+<< ndcontact >>
+rect 9 33 13 37
+rect 17 33 21 37
+rect 25 29 29 37
+rect 33 33 37 37
+rect 41 33 45 37
+rect 9 17 13 21
+rect 25 17 29 23
+rect 41 17 45 21
+<< pdcontact >>
+rect 17 54 21 58
+rect 25 54 29 58
+rect 33 54 37 58
+<< psubstratepcontact >>
+rect 25 9 29 13
+<< nsubstratencontact >>
+rect 25 68 29 72
+<< polysilicon >>
+rect 22 57 24 60
+rect 30 57 32 60
+rect 22 44 24 54
+rect 30 51 32 54
+rect 31 47 32 51
+rect 14 37 16 44
+rect 22 40 23 44
+rect 22 37 24 40
+rect 30 37 32 47
+rect 38 37 40 44
+rect 14 31 16 33
+rect 38 31 40 33
+rect 14 23 16 24
+rect 22 23 24 29
+rect 30 23 32 29
+rect 38 23 40 24
+rect 14 15 16 17
+rect 22 15 24 17
+rect 30 15 32 17
+rect 38 15 40 17
+<< polycontact >>
+rect 27 47 31 51
+rect 10 40 14 44
+rect 23 40 27 44
+rect 40 40 44 44
+rect 12 24 16 28
+rect 38 24 42 28
 << metal1 >>
 rect 0 68 25 72
 rect 29 68 54 72
@@ -71,6 +107,17 @@ rect 29 9 54 13
 rect 0 2 16 6
 rect 20 2 34 6
 rect 38 2 54 6
+<< m2contact >>
+rect 25 68 29 72
+rect 25 54 29 58
+rect 2 33 6 37
+rect 48 33 52 37
+rect 16 24 20 28
+rect 34 24 38 28
+rect 9 17 13 21
+rect 41 17 45 21
+rect 16 2 20 6
+rect 34 2 38 6
 << metal2 >>
 rect 2 37 6 72
 rect 2 0 6 33
@@ -80,47 +127,11 @@ rect 9 0 13 17
 rect 16 6 20 24
 rect 34 6 38 24
 rect 41 21 45 72
-rect 48 37 52 72
 rect 41 0 45 17
+rect 48 37 52 72
 rect 48 0 52 33
-<< ntransistor >>
-rect 14 33 16 37
-rect 22 29 24 37
-rect 30 29 32 37
-rect 38 33 40 37
-rect 14 17 16 23
-rect 22 17 24 23
-rect 30 17 32 23
-rect 38 17 40 23
-<< ptransistor >>
-rect 22 54 24 57
-rect 30 54 32 57
-<< polycontact >>
-rect 27 47 31 51
-rect 10 40 14 44
-rect 23 40 27 44
-rect 40 40 44 44
-rect 12 24 16 28
-rect 38 24 42 28
-<< ndcontact >>
-rect 9 33 13 37
-rect 17 33 21 37
-rect 25 29 29 37
-rect 33 33 37 37
-rect 41 33 45 37
-rect 25 17 29 23
-<< pdcontact >>
-rect 17 54 21 58
-rect 33 54 37 58
-<< m2contact >>
-rect 2 33 6 37
-rect 48 33 52 37
-rect 16 24 20 28
-rect 34 24 38 28
-rect 16 2 20 6
-rect 34 2 38 6
-<< psubstratepcontact >>
-rect 25 9 29 13
+<< comment >>
+rect 0 0 54 70
 << labels >>
 rlabel metal1 19 63 19 63 1 wl0
 rlabel metal1 19 70 19 70 5 vdd
@@ -130,6 +141,6 @@ rlabel metal2 4 7 4 7 2 bl0
 rlabel metal2 11 7 11 7 1 bl1
 rlabel metal2 43 7 43 7 1 br1
 rlabel metal2 50 7 50 7 8 br0
-rlabel metal1 19 49 19 49 1 Q
-rlabel metal1 35 42 35 42 1 Q_bar
+rlabel polycontact 29 49 29 49 1 Q
+rlabel polycontact 25 42 25 42 1 Q_bar
 << end >>
diff --git a/technology/scn4m_subm/mag_lib/cell_6t.mag b/technology/scn4m_subm/mag_lib/cell_6t.mag
index 6b277af2..17206ac6 100644
--- a/technology/scn4m_subm/mag_lib/cell_6t.mag
+++ b/technology/scn4m_subm/mag_lib/cell_6t.mag
@@ -1,28 +1,18 @@
 magic
 tech scmos
-timestamp 1572949512
-<< pwell >>
-rect -8 -2 42 35
+timestamp 1577066121
 << nwell >>
 rect -8 35 42 57
-<< polysilicon >>
-rect 7 46 11 48
-rect 27 46 31 48
-rect 7 41 11 43
-rect 7 27 9 41
-rect 27 40 31 43
-rect 15 39 31 40
-rect 19 38 31 39
-rect 7 26 21 27
-rect 7 25 24 26
-rect 7 24 9 25
-rect 29 24 31 38
-rect 7 14 9 16
-rect 17 11 21 12
-rect 29 14 31 16
-rect -2 9 10 11
-rect 14 9 24 11
-rect 28 9 36 11
+<< pwell >>
+rect -8 -2 42 35
+<< ntransistor >>
+rect 7 16 9 24
+rect 29 16 31 24
+rect 10 9 14 11
+rect 24 9 28 11
+<< ptransistor >>
+rect 7 43 11 46
+rect 27 43 31 46
 << ndiffusion >>
 rect -2 22 7 24
 rect 2 18 7 22
@@ -43,6 +33,45 @@ rect 2 43 7 46
 rect 11 43 12 46
 rect 26 43 27 46
 rect 31 43 32 46
+<< ndcontact >>
+rect -2 18 2 22
+rect 10 20 14 24
+rect 24 20 28 24
+rect 32 18 36 22
+rect 10 4 14 8
+rect 24 4 28 8
+<< pdcontact >>
+rect -2 42 2 46
+rect 12 42 16 46
+rect 22 42 26 46
+rect 32 42 36 46
+<< psubstratepcontact >>
+rect -2 28 2 32
+rect 32 28 36 32
+<< nsubstratencontact >>
+rect 32 50 36 54
+<< polysilicon >>
+rect 7 46 11 48
+rect 27 46 31 48
+rect 7 41 11 43
+rect 7 27 9 41
+rect 27 40 31 43
+rect 15 39 31 40
+rect 19 38 31 39
+rect 7 26 21 27
+rect 7 25 24 26
+rect 7 24 9 25
+rect 29 24 31 38
+rect 7 14 9 16
+rect 17 11 21 12
+rect 29 14 31 16
+rect -2 9 10 11
+rect 14 9 24 11
+rect 28 9 36 11
+<< polycontact >>
+rect 15 35 19 39
+rect 21 26 25 30
+rect 17 12 21 16
 << metal1 >>
 rect -2 50 15 54
 rect 19 50 32 54
@@ -63,6 +92,12 @@ rect 32 22 36 28
 rect -2 12 17 15
 rect 21 12 36 15
 rect -2 11 36 12
+<< m2contact >>
+rect 15 50 19 54
+rect -2 35 2 39
+rect 32 35 36 39
+rect 6 4 10 8
+rect 20 4 24 8
 << metal2 >>
 rect -2 39 2 54
 rect -2 0 2 35
@@ -71,41 +106,8 @@ rect 6 0 10 4
 rect 24 0 28 54
 rect 32 39 36 54
 rect 32 0 36 35
-<< ntransistor >>
-rect 7 16 9 24
-rect 29 16 31 24
-rect 10 9 14 11
-rect 24 9 28 11
-<< ptransistor >>
-rect 7 43 11 46
-rect 27 43 31 46
-<< polycontact >>
-rect 15 35 19 39
-rect 21 26 25 30
-rect 17 12 21 16
-<< ndcontact >>
-rect -2 18 2 22
-rect 10 20 14 24
-rect 24 20 28 24
-rect 32 18 36 22
-rect 10 4 14 8
-rect 24 4 28 8
-<< pdcontact >>
-rect -2 42 2 46
-rect 12 42 16 46
-rect 22 42 26 46
-rect 32 42 36 46
-<< m2contact >>
-rect 15 50 19 54
-rect -2 35 2 39
-rect 32 35 36 39
-rect 6 4 10 8
-rect 20 4 24 8
-<< psubstratepcontact >>
-rect -2 28 2 32
-rect 32 28 36 32
-<< nsubstratencontact >>
-rect 32 50 36 54
+<< bb >>
+rect 0 0 34 52
 << labels >>
 rlabel metal2 0 6 0 6 1 gnd
 rlabel metal2 34 6 34 6 1 gnd
@@ -113,6 +115,6 @@ rlabel m2contact 17 52 17 52 5 vdd
 rlabel metal2 8 49 8 49 1 bl
 rlabel metal2 26 49 26 49 1 br
 rlabel metal1 4 13 4 13 1 wl
-rlabel polycontact 23 28 23 28 1 Q_bar
 rlabel polycontact 17 37 17 37 1 Q
+rlabel polycontact 23 28 23 28 1 Q_bar
 << end >>
diff --git a/technology/scn4m_subm/mag_lib/dummy_cell_1rw_1r.mag b/technology/scn4m_subm/mag_lib/dummy_cell_1rw_1r.mag
index 79b5daf0..1931485f 100644
--- a/technology/scn4m_subm/mag_lib/dummy_cell_1rw_1r.mag
+++ b/technology/scn4m_subm/mag_lib/dummy_cell_1rw_1r.mag
@@ -1,10 +1,63 @@
 magic
 tech scmos
-timestamp 1572949567
-<< pwell >>
-rect 0 0 54 46
+timestamp 1577067400
 << nwell >>
 rect 0 46 54 75
+<< pwell >>
+rect 0 0 54 46
+<< ntransistor >>
+rect 14 33 16 37
+rect 22 29 24 37
+rect 30 29 32 37
+rect 38 33 40 37
+rect 14 17 16 23
+rect 22 17 24 23
+rect 30 17 32 23
+rect 38 17 40 23
+<< ptransistor >>
+rect 22 54 24 57
+rect 30 54 32 57
+<< ndiffusion >>
+rect 13 33 14 37
+rect 16 33 17 37
+rect 21 33 22 37
+rect 17 29 22 33
+rect 24 29 25 37
+rect 29 29 30 37
+rect 32 33 33 37
+rect 37 33 38 37
+rect 40 33 41 37
+rect 32 29 37 33
+rect 9 21 14 23
+rect 13 17 14 21
+rect 16 17 22 23
+rect 24 17 25 23
+rect 29 17 30 23
+rect 32 17 38 23
+rect 40 21 45 23
+rect 40 17 41 21
+<< pdiffusion >>
+rect 21 54 22 57
+rect 24 54 25 57
+rect 29 54 30 57
+rect 32 54 33 57
+<< ndcontact >>
+rect 9 33 13 37
+rect 17 33 21 37
+rect 25 29 29 37
+rect 33 33 37 37
+rect 41 33 45 37
+rect 9 17 13 21
+rect 25 17 29 23
+rect 41 17 45 21
+<< pdcontact >>
+rect 17 54 21 58
+rect 25 54 29 58
+rect 33 54 37 58
+<< psubstratepcontact >>
+rect 25 9 29 13
+<< nsubstratencontact >>
+rect 25 68 29 72
 << polysilicon >>
 rect 22 57 24 60
 rect 30 57 32 60
@@ -26,30 +79,13 @@ rect 14 15 16 17
 rect 22 15 24 17
 rect 30 15 32 17
 rect 38 15 40 17
-<< ndiffusion >>
-rect 13 33 14 37
-rect 16 33 17 37
-rect 21 33 22 37
-rect 17 29 22 33
-rect 24 29 25 37
-rect 29 29 30 37
-rect 32 33 33 37
-rect 37 33 38 37
-rect 40 33 41 37
-rect 32 29 37 33
-rect 9 21 14 23
-rect 13 17 14 21
-rect 16 17 22 23
-rect 24 17 25 23
-rect 29 17 30 23
-rect 32 17 38 23
-rect 40 21 45 23
-rect 40 17 41 21
-<< pdiffusion >>
-rect 25 57 29 58
-rect 21 54 22 57
-rect 24 54 30 57
-rect 32 54 33 57
+<< polycontact >>
+rect 27 47 31 51
+rect 10 40 14 44
+rect 23 40 27 44
+rect 40 40 44 44
+rect 12 24 16 28
+rect 38 24 42 28
 << metal1 >>
 rect 0 68 25 72
 rect 29 68 54 72
@@ -71,6 +107,13 @@ rect 29 9 54 13
 rect 0 2 16 6
 rect 20 2 34 6
 rect 38 2 54 6
+<< m2contact >>
+rect 25 68 29 72
+rect 25 54 29 58
+rect 16 24 20 28
+rect 34 24 38 28
+rect 16 2 20 6
+rect 34 2 38 6
 << metal2 >>
 rect 2 0 6 72
 rect 9 0 13 72
@@ -79,48 +122,8 @@ rect 16 6 20 24
 rect 34 6 38 24
 rect 41 0 45 72
 rect 48 0 52 72
-<< ntransistor >>
-rect 14 33 16 37
-rect 22 29 24 37
-rect 30 29 32 37
-rect 38 33 40 37
-rect 14 17 16 23
-rect 22 17 24 23
-rect 30 17 32 23
-rect 38 17 40 23
-<< ptransistor >>
-rect 22 54 24 57
-rect 30 54 32 57
-<< polycontact >>
-rect 27 47 31 51
-rect 10 40 14 44
-rect 23 40 27 44
-rect 40 40 44 44
-rect 12 24 16 28
-rect 38 24 42 28
-<< ndcontact >>
-rect 9 33 13 37
-rect 17 33 21 37
-rect 25 29 29 37
-rect 33 33 37 37
-rect 41 33 45 37
-rect 9 17 13 21
-rect 25 17 29 23
-rect 41 17 45 21
-<< pdcontact >>
-rect 17 54 21 58
-rect 33 54 37 58
-<< m2contact >>
-rect 25 68 29 72
-rect 25 54 29 58
-rect 16 24 20 28
-rect 34 24 38 28
-rect 16 2 20 6
-rect 34 2 38 6
-<< psubstratepcontact >>
-rect 25 9 29 13
-<< nsubstratendiff >>
-rect 25 68 29 72
+<< comment >>
+rect 0 0 54 70
 << labels >>
 rlabel metal1 19 63 19 63 1 wl0
 rlabel metal1 19 70 19 70 5 vdd
diff --git a/technology/scn4m_subm/mag_lib/dummy_cell_1w_1r.mag b/technology/scn4m_subm/mag_lib/dummy_cell_1w_1r.mag
index 9166b42a..1931485f 100644
--- a/technology/scn4m_subm/mag_lib/dummy_cell_1w_1r.mag
+++ b/technology/scn4m_subm/mag_lib/dummy_cell_1w_1r.mag
@@ -1,10 +1,63 @@
 magic
 tech scmos
-timestamp 1572949619
-<< pwell >>
-rect 0 0 54 46
+timestamp 1577067400
 << nwell >>
 rect 0 46 54 75
+<< pwell >>
+rect 0 0 54 46
+<< ntransistor >>
+rect 14 33 16 37
+rect 22 29 24 37
+rect 30 29 32 37
+rect 38 33 40 37
+rect 14 17 16 23
+rect 22 17 24 23
+rect 30 17 32 23
+rect 38 17 40 23
+<< ptransistor >>
+rect 22 54 24 57
+rect 30 54 32 57
+<< ndiffusion >>
+rect 13 33 14 37
+rect 16 33 17 37
+rect 21 33 22 37
+rect 17 29 22 33
+rect 24 29 25 37
+rect 29 29 30 37
+rect 32 33 33 37
+rect 37 33 38 37
+rect 40 33 41 37
+rect 32 29 37 33
+rect 9 21 14 23
+rect 13 17 14 21
+rect 16 17 22 23
+rect 24 17 25 23
+rect 29 17 30 23
+rect 32 17 38 23
+rect 40 21 45 23
+rect 40 17 41 21
+<< pdiffusion >>
+rect 21 54 22 57
+rect 24 54 25 57
+rect 29 54 30 57
+rect 32 54 33 57
+<< ndcontact >>
+rect 9 33 13 37
+rect 17 33 21 37
+rect 25 29 29 37
+rect 33 33 37 37
+rect 41 33 45 37
+rect 9 17 13 21
+rect 25 17 29 23
+rect 41 17 45 21
+<< pdcontact >>
+rect 17 54 21 58
+rect 25 54 29 58
+rect 33 54 37 58
+<< psubstratepcontact >>
+rect 25 9 29 13
+<< nsubstratencontact >>
+rect 25 68 29 72
 << polysilicon >>
 rect 22 57 24 60
 rect 30 57 32 60
@@ -26,30 +79,13 @@ rect 14 15 16 17
 rect 22 15 24 17
 rect 30 15 32 17
 rect 38 15 40 17
-<< ndiffusion >>
-rect 13 33 14 37
-rect 16 33 17 37
-rect 21 33 22 37
-rect 17 29 22 33
-rect 24 29 25 37
-rect 29 29 30 37
-rect 32 33 33 37
-rect 37 33 38 37
-rect 40 33 41 37
-rect 32 29 37 33
-rect 9 21 14 23
-rect 13 17 14 21
-rect 16 17 22 23
-rect 24 17 25 23
-rect 29 17 30 23
-rect 32 17 38 23
-rect 40 21 45 23
-rect 40 17 41 21
-<< pdiffusion >>
-rect 25 57 29 58
-rect 21 54 22 57
-rect 24 54 30 57
-rect 32 54 33 57
+<< polycontact >>
+rect 27 47 31 51
+rect 10 40 14 44
+rect 23 40 27 44
+rect 40 40 44 44
+rect 12 24 16 28
+rect 38 24 42 28
 << metal1 >>
 rect 0 68 25 72
 rect 29 68 54 72
@@ -71,6 +107,13 @@ rect 29 9 54 13
 rect 0 2 16 6
 rect 20 2 34 6
 rect 38 2 54 6
+<< m2contact >>
+rect 25 68 29 72
+rect 25 54 29 58
+rect 16 24 20 28
+rect 34 24 38 28
+rect 16 2 20 6
+rect 34 2 38 6
 << metal2 >>
 rect 2 0 6 72
 rect 9 0 13 72
@@ -79,48 +122,8 @@ rect 16 6 20 24
 rect 34 6 38 24
 rect 41 0 45 72
 rect 48 0 52 72
-<< ntransistor >>
-rect 14 33 16 37
-rect 22 29 24 37
-rect 30 29 32 37
-rect 38 33 40 37
-rect 14 17 16 23
-rect 22 17 24 23
-rect 30 17 32 23
-rect 38 17 40 23
-<< ptransistor >>
-rect 22 54 24 57
-rect 30 54 32 57
-<< polycontact >>
-rect 27 47 31 51
-rect 10 40 14 44
-rect 23 40 27 44
-rect 40 40 44 44
-rect 12 24 16 28
-rect 38 24 42 28
-<< ndcontact >>
-rect 9 33 13 37
-rect 17 33 21 37
-rect 25 29 29 37
-rect 33 33 37 37
-rect 41 33 45 37
-rect 9 17 13 21
-rect 25 17 29 23
-rect 41 17 45 21
-<< pdcontact >>
-rect 17 54 21 58
-rect 33 54 37 58
-<< m2contact >>
-rect 25 68 29 72
-rect 25 54 29 58
-rect 16 24 20 28
-rect 34 24 38 28
-rect 16 2 20 6
-rect 34 2 38 6
-<< psubstratepcontact >>
-rect 25 9 29 13
-<< nsubstratendiff >>
-rect 25 68 29 72
+<< comment >>
+rect 0 0 54 70
 << labels >>
 rlabel metal1 19 63 19 63 1 wl0
 rlabel metal1 19 70 19 70 5 vdd
diff --git a/technology/scn4m_subm/mag_lib/dummy_cell_6t.mag b/technology/scn4m_subm/mag_lib/dummy_cell_6t.mag
index 7f7591ba..515ef682 100644
--- a/technology/scn4m_subm/mag_lib/dummy_cell_6t.mag
+++ b/technology/scn4m_subm/mag_lib/dummy_cell_6t.mag
@@ -1,28 +1,18 @@
 magic
 tech scmos
-timestamp 1572949665
-<< pwell >>
-rect -8 -2 42 35
+timestamp 1577067400
 << nwell >>
 rect -8 35 42 57
-<< polysilicon >>
-rect 7 46 11 48
-rect 27 46 31 48
-rect 7 41 11 43
-rect 7 27 9 41
-rect 27 40 31 43
-rect 15 39 31 40
-rect 19 38 31 39
-rect 7 26 21 27
-rect 7 25 24 26
-rect 7 24 9 25
-rect 29 24 31 38
-rect 7 14 9 16
-rect 17 11 21 12
-rect 29 14 31 16
-rect -2 9 10 11
-rect 14 9 24 11
-rect 28 9 36 11
+<< pwell >>
+rect -8 -2 42 35
+<< ntransistor >>
+rect 7 16 9 24
+rect 29 16 31 24
+rect 10 9 14 11
+rect 24 9 28 11
+<< ptransistor >>
+rect 7 43 11 46
+rect 27 43 31 46
 << ndiffusion >>
 rect -2 22 7 24
 rect 2 18 7 22
@@ -43,6 +33,45 @@ rect 2 43 7 46
 rect 11 43 12 46
 rect 26 43 27 46
 rect 31 43 32 46
+<< ndcontact >>
+rect -2 18 2 22
+rect 10 20 14 24
+rect 24 20 28 24
+rect 32 18 36 22
+rect 10 4 14 8
+rect 24 4 28 8
+<< pdcontact >>
+rect -2 42 2 46
+rect 12 42 16 46
+rect 22 42 26 46
+rect 32 42 36 46
+<< psubstratepcontact >>
+rect -2 28 2 32
+rect 32 28 36 32
+<< nsubstratencontact >>
+rect 32 50 36 54
+<< polysilicon >>
+rect 7 46 11 48
+rect 27 46 31 48
+rect 7 41 11 43
+rect 7 27 9 41
+rect 27 40 31 43
+rect 15 39 31 40
+rect 19 38 31 39
+rect 7 26 21 27
+rect 7 25 24 26
+rect 7 24 9 25
+rect 29 24 31 38
+rect 7 14 9 16
+rect 17 11 21 12
+rect 29 14 31 16
+rect -2 9 10 11
+rect 14 9 24 11
+rect 28 9 36 11
+<< polycontact >>
+rect 15 35 19 39
+rect 21 26 25 30
+rect 17 12 21 16
 << metal1 >>
 rect -2 50 15 54
 rect 19 50 32 54
@@ -63,6 +92,10 @@ rect 32 22 36 28
 rect -2 12 17 15
 rect 21 12 36 15
 rect -2 11 36 12
+<< m2contact >>
+rect 15 50 19 54
+rect -2 35 2 39
+rect 32 35 36 39
 << metal2 >>
 rect -2 39 2 54
 rect -2 0 2 35
@@ -70,39 +103,8 @@ rect 6 0 10 54
 rect 24 0 28 54
 rect 32 39 36 54
 rect 32 0 36 35
-<< ntransistor >>
-rect 7 16 9 24
-rect 29 16 31 24
-rect 10 9 14 11
-rect 24 9 28 11
-<< ptransistor >>
-rect 7 43 11 46
-rect 27 43 31 46
-<< polycontact >>
-rect 15 35 19 39
-rect 21 26 25 30
-rect 17 12 21 16
-<< ndcontact >>
-rect -2 18 2 22
-rect 10 20 14 24
-rect 24 20 28 24
-rect 32 18 36 22
-rect 10 4 14 8
-rect 24 4 28 8
-<< pdcontact >>
-rect -2 42 2 46
-rect 12 42 16 46
-rect 22 42 26 46
-rect 32 42 36 46
-<< m2contact >>
-rect 15 50 19 54
-rect -2 35 2 39
-rect 32 35 36 39
-<< psubstratepcontact >>
-rect -2 28 2 32
-rect 32 28 36 32
-<< nsubstratencontact >>
-rect 32 50 36 54
+<< bb >>
+rect 0 0 34 52
 << labels >>
 rlabel metal2 0 6 0 6 1 gnd
 rlabel metal2 34 6 34 6 1 gnd
diff --git a/technology/scn4m_subm/mag_lib/replica_cell_1rw_1r.mag b/technology/scn4m_subm/mag_lib/replica_cell_1rw_1r.mag
index 9b6e203b..982e1630 100644
--- a/technology/scn4m_subm/mag_lib/replica_cell_1rw_1r.mag
+++ b/technology/scn4m_subm/mag_lib/replica_cell_1rw_1r.mag
@@ -1,10 +1,63 @@
 magic
 tech scmos
-timestamp 1572949704
-<< pwell >>
-rect 0 0 54 46
+timestamp 1577067400
 << nwell >>
 rect 0 46 54 75
+<< pwell >>
+rect 0 0 54 46
+<< ntransistor >>
+rect 14 33 16 37
+rect 22 29 24 37
+rect 30 29 32 37
+rect 38 33 40 37
+rect 14 17 16 23
+rect 22 17 24 23
+rect 30 17 32 23
+rect 38 17 40 23
+<< ptransistor >>
+rect 22 54 24 57
+rect 30 54 32 57
+<< ndiffusion >>
+rect 13 33 14 37
+rect 16 33 17 37
+rect 21 33 22 37
+rect 17 29 22 33
+rect 24 29 25 37
+rect 29 29 30 37
+rect 32 33 33 37
+rect 37 33 38 37
+rect 40 33 41 37
+rect 32 29 37 33
+rect 9 21 14 23
+rect 13 17 14 21
+rect 16 17 22 23
+rect 24 17 25 23
+rect 29 17 30 23
+rect 32 17 38 23
+rect 40 21 45 23
+rect 40 17 41 21
+<< pdiffusion >>
+rect 21 54 22 57
+rect 24 54 25 57
+rect 29 54 30 57
+rect 32 54 33 57
+<< ndcontact >>
+rect 9 33 13 37
+rect 17 33 21 37
+rect 25 29 29 37
+rect 33 33 37 37
+rect 41 33 45 37
+rect 9 17 13 21
+rect 25 17 29 23
+rect 41 17 45 21
+<< pdcontact >>
+rect 17 54 21 58
+rect 25 54 29 58
+rect 33 54 37 58
+<< psubstratepcontact >>
+rect 25 9 29 13
+<< nsubstratencontact >>
+rect 25 68 29 72
 << polysilicon >>
 rect 22 57 24 60
 rect 30 57 32 60
@@ -26,28 +79,13 @@ rect 14 15 16 17
 rect 22 15 24 17
 rect 30 15 32 17
 rect 38 15 40 17
-<< ndiffusion >>
-rect 13 33 14 37
-rect 16 33 17 37
-rect 21 33 22 37
-rect 17 29 22 33
-rect 24 29 25 37
-rect 29 29 30 37
-rect 32 33 33 37
-rect 37 33 38 37
-rect 40 33 41 37
-rect 32 29 37 33
-rect 9 17 14 23
-rect 16 17 22 23
-rect 24 17 25 23
-rect 29 17 30 23
-rect 32 17 38 23
-rect 40 17 45 23
-<< pdiffusion >>
-rect 25 57 29 58
-rect 21 54 22 57
-rect 24 54 30 57
-rect 32 54 33 57
+<< polycontact >>
+rect 27 47 31 51
+rect 10 40 14 44
+rect 23 40 27 44
+rect 40 40 44 44
+rect 12 24 16 28
+rect 38 24 42 28
 << metal1 >>
 rect 0 68 25 72
 rect 29 68 54 72
@@ -70,6 +108,17 @@ rect 29 9 54 13
 rect 0 2 16 6
 rect 20 2 34 6
 rect 38 2 54 6
+<< m2contact >>
+rect 25 68 29 72
+rect 25 54 29 58
+rect 2 33 6 37
+rect 48 33 52 37
+rect 16 24 20 28
+rect 34 24 38 28
+rect 9 17 13 21
+rect 41 17 45 21
+rect 16 2 20 6
+rect 34 2 38 6
 << metal2 >>
 rect 2 37 6 72
 rect 2 0 6 33
@@ -82,50 +131,8 @@ rect 41 21 45 72
 rect 41 0 45 17
 rect 48 37 52 72
 rect 48 0 52 33
-<< ntransistor >>
-rect 14 33 16 37
-rect 22 29 24 37
-rect 30 29 32 37
-rect 38 33 40 37
-rect 14 17 16 23
-rect 22 17 24 23
-rect 30 17 32 23
-rect 38 17 40 23
-<< ptransistor >>
-rect 22 54 24 57
-rect 30 54 32 57
-<< polycontact >>
-rect 27 47 31 51
-rect 10 40 14 44
-rect 23 40 27 44
-rect 40 40 44 44
-rect 12 24 16 28
-rect 38 24 42 28
-<< ndcontact >>
-rect 9 33 13 37
-rect 17 33 21 37
-rect 25 29 29 37
-rect 33 33 37 37
-rect 41 33 45 37
-rect 25 17 29 23
-<< pdcontact >>
-rect 17 54 21 58
-rect 33 54 37 58
-<< m2contact >>
-rect 25 68 29 72
-rect 25 54 29 58
-rect 2 33 6 37
-rect 48 33 52 37
-rect 16 24 20 28
-rect 34 24 38 28
-rect 9 17 13 21
-rect 41 17 45 21
-rect 16 2 20 6
-rect 34 2 38 6
-<< psubstratepcontact >>
-rect 25 9 29 13
-<< nsubstratendiff >>
-rect 25 68 29 72
+<< comment >>
+rect 0 0 54 70
 << labels >>
 rlabel metal1 19 63 19 63 1 wl0
 rlabel metal1 19 70 19 70 5 vdd
diff --git a/technology/scn4m_subm/mag_lib/replica_cell_1w_1r.mag b/technology/scn4m_subm/mag_lib/replica_cell_1w_1r.mag
index b2a525e8..61add325 100644
--- a/technology/scn4m_subm/mag_lib/replica_cell_1w_1r.mag
+++ b/technology/scn4m_subm/mag_lib/replica_cell_1w_1r.mag
@@ -1,10 +1,63 @@
 magic
 tech scmos
-timestamp 1572949741
-<< pwell >>
-rect 0 0 54 46
+timestamp 1577067446
 << nwell >>
 rect 0 46 54 75
+<< pwell >>
+rect 0 0 54 46
+<< ntransistor >>
+rect 14 33 16 37
+rect 22 29 24 37
+rect 30 29 32 37
+rect 38 33 40 37
+rect 14 17 16 23
+rect 22 17 24 23
+rect 30 17 32 23
+rect 38 17 40 23
+<< ptransistor >>
+rect 22 54 24 57
+rect 30 54 32 57
+<< ndiffusion >>
+rect 13 33 14 37
+rect 16 33 17 37
+rect 21 33 22 37
+rect 17 29 22 33
+rect 24 29 25 37
+rect 29 29 30 37
+rect 32 33 33 37
+rect 37 33 38 37
+rect 40 33 41 37
+rect 32 29 37 33
+rect 9 21 14 23
+rect 13 17 14 21
+rect 16 17 22 23
+rect 24 17 25 23
+rect 29 17 30 23
+rect 32 17 38 23
+rect 40 21 45 23
+rect 40 17 41 21
+<< pdiffusion >>
+rect 21 54 22 57
+rect 24 54 25 57
+rect 29 54 30 57
+rect 32 54 33 57
+<< ndcontact >>
+rect 9 33 13 37
+rect 17 33 21 37
+rect 25 29 29 37
+rect 33 33 37 37
+rect 41 33 45 37
+rect 9 17 13 21
+rect 25 17 29 23
+rect 41 17 45 21
+<< pdcontact >>
+rect 17 54 21 58
+rect 25 54 29 58
+rect 33 54 37 58
+<< psubstratepcontact >>
+rect 25 9 29 13
+<< nsubstratencontact >>
+rect 25 68 29 72
 << polysilicon >>
 rect 22 57 24 60
 rect 30 57 32 60
@@ -26,28 +79,13 @@ rect 14 15 16 17
 rect 22 15 24 17
 rect 30 15 32 17
 rect 38 15 40 17
-<< ndiffusion >>
-rect 13 33 14 37
-rect 16 33 17 37
-rect 21 33 22 37
-rect 17 29 22 33
-rect 24 29 25 37
-rect 29 29 30 37
-rect 32 33 33 37
-rect 37 33 38 37
-rect 40 33 41 37
-rect 32 29 37 33
-rect 9 17 14 23
-rect 16 17 22 23
-rect 24 17 25 23
-rect 29 17 30 23
-rect 32 17 38 23
-rect 40 17 45 23
-<< pdiffusion >>
-rect 25 57 29 58
-rect 21 54 22 57
-rect 24 54 30 57
-rect 32 54 33 57
+<< polycontact >>
+rect 27 47 31 51
+rect 10 40 14 44
+rect 23 40 27 44
+rect 40 40 44 44
+rect 12 24 16 28
+rect 38 24 42 28
 << metal1 >>
 rect 0 68 25 72
 rect 29 68 54 72
@@ -70,6 +108,17 @@ rect 29 9 54 13
 rect 0 2 16 6
 rect 20 2 34 6
 rect 38 2 54 6
+<< m2contact >>
+rect 25 68 29 72
+rect 25 54 29 58
+rect 2 33 6 37
+rect 48 33 52 37
+rect 16 24 20 28
+rect 34 24 38 28
+rect 9 17 13 21
+rect 41 17 45 21
+rect 16 2 20 6
+rect 34 2 38 6
 << metal2 >>
 rect 2 37 6 72
 rect 2 0 6 33
@@ -82,50 +131,8 @@ rect 41 21 45 72
 rect 41 0 45 17
 rect 48 37 52 72
 rect 48 0 52 33
-<< ntransistor >>
-rect 14 33 16 37
-rect 22 29 24 37
-rect 30 29 32 37
-rect 38 33 40 37
-rect 14 17 16 23
-rect 22 17 24 23
-rect 30 17 32 23
-rect 38 17 40 23
-<< ptransistor >>
-rect 22 54 24 57
-rect 30 54 32 57
-<< polycontact >>
-rect 27 47 31 51
-rect 10 40 14 44
-rect 23 40 27 44
-rect 40 40 44 44
-rect 12 24 16 28
-rect 38 24 42 28
-<< ndcontact >>
-rect 9 33 13 37
-rect 17 33 21 37
-rect 25 29 29 37
-rect 33 33 37 37
-rect 41 33 45 37
-rect 25 17 29 23
-<< pdcontact >>
-rect 17 54 21 58
-rect 33 54 37 58
-<< m2contact >>
-rect 25 68 29 72
-rect 25 54 29 58
-rect 2 33 6 37
-rect 48 33 52 37
-rect 16 24 20 28
-rect 34 24 38 28
-rect 9 17 13 21
-rect 41 17 45 21
-rect 16 2 20 6
-rect 34 2 38 6
-<< psubstratepcontact >>
-rect 25 9 29 13
-<< nsubstratendiff >>
-rect 25 68 29 72
+<< comment >>
+rect 0 0 54 70
 << labels >>
 rlabel metal1 19 63 19 63 1 wl0
 rlabel metal1 19 70 19 70 5 vdd
diff --git a/technology/scn4m_subm/mag_lib/replica_cell_6t.mag b/technology/scn4m_subm/mag_lib/replica_cell_6t.mag
index 316082ca..61a7646e 100644
--- a/technology/scn4m_subm/mag_lib/replica_cell_6t.mag
+++ b/technology/scn4m_subm/mag_lib/replica_cell_6t.mag
@@ -1,28 +1,18 @@
 magic
 tech scmos
-timestamp 1572949776
-<< pwell >>
-rect -8 -2 42 35
+timestamp 1577067503
 << nwell >>
 rect -8 35 42 57
-<< polysilicon >>
-rect 7 46 11 48
-rect 27 46 31 48
-rect 7 41 11 43
-rect 7 27 9 41
-rect 27 40 31 43
-rect 15 39 31 40
-rect 19 38 31 39
-rect 7 26 21 27
-rect 7 25 24 26
-rect 7 24 9 25
-rect 29 24 31 38
-rect 7 14 9 16
-rect 17 11 21 12
-rect 29 14 31 16
-rect -2 9 10 11
-rect 14 9 24 11
-rect 28 9 36 11
+<< pwell >>
+rect -8 -2 42 35
+<< ntransistor >>
+rect 7 16 9 24
+rect 29 16 31 24
+rect 10 9 14 11
+rect 24 9 28 11
+<< ptransistor >>
+rect 7 43 11 46
+rect 27 43 31 46
 << ndiffusion >>
 rect -2 22 7 24
 rect 2 18 7 22
@@ -43,6 +33,45 @@ rect 2 43 7 46
 rect 11 43 12 46
 rect 26 43 27 46
 rect 31 43 32 46
+<< ndcontact >>
+rect -2 18 2 22
+rect 10 20 14 24
+rect 24 20 28 24
+rect 32 18 36 22
+rect 10 4 14 8
+rect 24 4 28 8
+<< pdcontact >>
+rect -2 42 2 46
+rect 12 42 16 46
+rect 22 42 26 46
+rect 32 42 36 46
+<< psubstratepcontact >>
+rect -2 28 2 32
+rect 32 28 36 32
+<< nsubstratencontact >>
+rect 32 50 36 54
+<< polysilicon >>
+rect 7 46 11 48
+rect 27 46 31 48
+rect 7 41 11 43
+rect 7 27 9 41
+rect 27 40 31 43
+rect 15 39 31 40
+rect 19 38 31 39
+rect 7 26 21 27
+rect 7 25 24 26
+rect 7 24 9 25
+rect 29 24 31 38
+rect 7 14 9 16
+rect 17 11 21 12
+rect 29 14 31 16
+rect -2 9 10 11
+rect 14 9 24 11
+rect 28 9 36 11
+<< polycontact >>
+rect 15 35 19 39
+rect 21 26 25 30
+rect 17 12 21 16
 << metal1 >>
 rect -2 50 15 54
 rect 19 50 32 54
@@ -64,6 +93,12 @@ rect 32 22 36 28
 rect -2 12 17 15
 rect 21 12 36 15
 rect -2 11 36 12
+<< m2contact >>
+rect 15 50 19 54
+rect -2 35 2 39
+rect 32 35 36 39
+rect 6 4 10 8
+rect 20 4 24 8
 << metal2 >>
 rect -2 39 2 54
 rect -2 0 2 35
@@ -72,41 +107,8 @@ rect 6 0 10 4
 rect 24 0 28 54
 rect 32 39 36 54
 rect 32 0 36 35
-<< ntransistor >>
-rect 7 16 9 24
-rect 29 16 31 24
-rect 10 9 14 11
-rect 24 9 28 11
-<< ptransistor >>
-rect 7 43 11 46
-rect 27 43 31 46
-<< polycontact >>
-rect 15 35 19 39
-rect 21 26 25 30
-rect 17 12 21 16
-<< ndcontact >>
-rect -2 18 2 22
-rect 10 20 14 24
-rect 24 20 28 24
-rect 32 18 36 22
-rect 10 4 14 8
-rect 24 4 28 8
-<< pdcontact >>
-rect -2 42 2 46
-rect 12 42 16 46
-rect 22 42 26 46
-rect 32 42 36 46
-<< m2contact >>
-rect 15 50 19 54
-rect -2 35 2 39
-rect 32 35 36 39
-rect 6 4 10 8
-rect 20 4 24 8
-<< psubstratepcontact >>
-rect -2 28 2 32
-rect 32 28 36 32
-<< nsubstratencontact >>
-rect 32 50 36 54
+<< bb >>
+rect 0 0 34 52
 << labels >>
 rlabel metal2 0 6 0 6 1 gnd
 rlabel metal2 34 6 34 6 1 gnd