diff --git a/urql/lib/parse.hoon b/urql/lib/parse.hoon
index e683e19..11556b6 100755
--- a/urql/lib/parse.hoon
+++ b/urql/lib/parse.hoon
@@ -1,15 +1,49 @@
 /-  ast
-/+  regex
 !:
 :: a library for parsing urQL tapes
 :: (parse:parse(default-database '<db>') "<script>")
 |_  default-database=@tas
 ::
+::  +strip-cmnts: strip block comments from tape
+::
+::  Crash
+::    comment block mismatch line <n>
+::
+++  strip-cmnts
+  |=  p=tape
+  =/  a=@  0
+  =/  b=tape  ~
+  =/  c=(list @)  (flop (fand ~['\0a'] p))
+  |-  ^-  tape
+  ?~  p  b
+  ?~  c
+    ?:  &(=(a 1) =("/*" (scag 2 `tape`p)))  $(p ~)
+      $(p ~, b (weld p b))
+  ?:  =("*/" (scag 2 (slag (add 1 i.c) `tape`p)))
+    %=  $
+      p  (scag i.c `tape`p)
+      a  (add a 1)
+      b  ?.(=(a 0) b (weld (slag (add 3 i.c) `tape`p) b))
+      c  t.c
+    ==
+  ?:  =("/*" (scag 2 (slag (add 1 i.c) `tape`p)))
+    %=  $
+      p  (scag i.c `tape`p)
+      a  ~|  "comment block mismatch line {<(lent c)>}"  (sub a 1)
+      c  t.c
+    ==
+  ?.  =(a 0)  $(p (scag i.c `tape`p), c t.c)
+  %=  $
+    p  (scag i.c `tape`p)
+    b  (weld (slag (add 1 i.c) `tape`p) b)
+    c  t.c
+  ==
+::
 ::  +parse: parse urQL script, emitting list of high level AST structures
 ++  parse
   |=  raw-script=tape
   ^-  (list command:ast)
-  =/  script=tape  (gsub:regex "\\/\\*[^\\*]*\\*\\/" ~ raw-script) :: multiline comments
+  =/  script=tape  (strip-cmnts raw-script)
   =/  commands  `(list command:ast)`~
   =/  script-length  (lent script)
   =/  displacement  0
diff --git a/urql/tests/lib/parse-sans.hoon b/urql/tests/lib/parse-sans.hoon
index dfd28c4..9d2e9b5 100755
--- a/urql/tests/lib/parse-sans.hoon
+++ b/urql/tests/lib/parse-sans.hoon
@@ -5,9 +5,9 @@
 ++  m-cmnt-1
   "/* line1\0a  line2 \0a line3\0a*/"
 ++  m-cmnt-2
-  "/* linea\0a  lineb \0a linec */"
+  "\0a/* linea\0a  lineb \0a linec \0a*/"
 ++  m-cmnt-3
-  "/* linea1\0a  lineb2 \0a linec3 */"
+  "\0a/* linea1 \0a lineb2 \0a linec3 \0a*/"
 
 ++  test-multiline-cmnt-00
   =/  expected1  [%create-namespace database-name='other-db' name='ns1' as-of=~]
@@ -24,7 +24,6 @@
                               "cReate namesPace db1.db1-ns1\0a" 
                               m-cmnt-3
                               ==
-
 ++  test-multiline-cmnt-01
   =/  expected1  [%create-namespace database-name='other-db' name='ns1' as-of=~]
   =/  expected2  [%create-namespace database-name='db1' name='db1-ns1' as-of=~]
@@ -81,7 +80,7 @@
     !>  %-  parse:parse(default-database 'other-db') 
             %-  zing 
                 %-  limo  :~  "cReate\0a" 
-                              "  namespace ns1" 
+                              "  namespace ns1\0a" 
                               m-cmnt-1 
                               " ; " 
                               m-cmnt-2 
@@ -89,15 +88,31 @@
                               m-cmnt-3
                               ==
 
+++  vfas-tar  [%selected-value value=[p=~.t q=10.799] alias=~]
+++  vhep-hep  [%selected-value value=[p=~.t q=11.565] alias=~]
+++  vtar-fas  [%selected-value value=[p=~.t q=12.074] alias=~]
+++  va-fas-tar-a  [%selected-value value=[p=~.t q=539.635.488] alias=~]
+++  va-hep-hep-a  [%selected-value value=[p=~.t q=539.831.584] alias=~]
+++  va-tar-fas-a  [%selected-value value=[p=~.t q=539.961.888] alias=~]
+
+++  s1  ~[vfas-tar vtar-fas vhep-hep va-fas-tar-a va-tar-fas-a va-hep-hep-a]
+++  s2  ~[va-hep-hep-a vfas-tar vtar-fas vhep-hep va-fas-tar-a va-tar-fas-a]
+++  s3  ~[va-tar-fas-a va-hep-hep-a vfas-tar vtar-fas vhep-hep va-fas-tar-a]
+
+++  q1  [%query from=~ scalars=~ predicate=~ group-by=~ having=~ selection=[%select top=~ bottom=~ columns=s1] order-by=~]
+++  q2  [%query from=~ scalars=~ predicate=~ group-by=~ having=~ selection=[%select top=~ bottom=~ columns=s2] order-by=~]
+++  q3  [%query from=~ scalars=~ predicate=~ group-by=~ having=~ selection=[%select top=~ bottom=~ columns=s3] order-by=~]
+
+++  t1  [%transform ctes=~ set-functions=[q1 ~ ~]]
+++  t2  [%transform ctes=~ set-functions=[q2 ~ ~]]
+++  t3  [%transform ctes=~ set-functions=[q3 ~ ~]]
 
 ++  test-multiline-cmnt-005
-  =/  expected1  [%create-namespace database-name='other-db' name='ns1' as-of=~]
-  =/  expected2  [%create-namespace database-name='db1' name='db1-ns1' as-of=~]
   %+  expect-eq
-    !>  ~[expected1 expected2]
+    !>  ~[t1 t2 t3]
     !>  %-  parse:parse(default-database 'other-db') 
             %-  zing 
-                %-  limo  :~  "select '\2f\2a', '*\2f', '--', ' \2f\2a ', ' *\2f ', ' -- '" 
+                %-  limo  :~  "select '\2f\2a', '*\2f', '--', ' \2f\2a ', ' *\2f ', ' -- '\0a" 
                               m-cmnt-1 
                               "select ' -- ', '\2f\2a', '*\2f', '--', ' \2f\2a ', ' *\2f '" 
                               m-cmnt-2 
@@ -105,6 +120,7 @@
                               m-cmnt-3
                               ==
 
+
 ::@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 ::
 :: expected/actual match
diff --git a/urql/tests/lib/parse.hoon b/urql/tests/lib/parse.hoon
index 18ba549..0283193 100755
--- a/urql/tests/lib/parse.hoon
+++ b/urql/tests/lib/parse.hoon
@@ -2375,37 +2375,118 @@
 ++  m-cmnt-1
   "/* line1\0a  line2 \0a line3\0a*/"
 ++  m-cmnt-2
-  "/* linea\0a  lineb \0a linec */"
+  "\0a/* linea\0a  lineb \0a linec \0a*/"
 ++  m-cmnt-3
-  "/* linea1\0a  lineb2 \0a linec3 */"
+  "\0a/* linea1 \0a lineb2 \0a linec3 \0a*/"
+::
 ++  test-multiline-cmnt-00
   =/  expected1  [%create-namespace database-name='other-db' name='ns1' as-of=~]
   =/  expected2  [%create-namespace database-name='db1' name='db1-ns1' as-of=~]
   %+  expect-eq
     !>  ~[expected1 expected2]
-    !>  (parse:parse(default-database 'other-db') (zing (limo ~[m-cmnt-1 "cReate" m-cmnt-2 "  namespace ns1\0a" " ; \0a" "cReate namesPace db1.db1-ns1\0a" m-cmnt-3])))
+    !>  %-  parse:parse(default-database 'other-db') 
+            %-  zing 
+                %-  limo  :~  m-cmnt-1 
+                              "cReate" 
+                              m-cmnt-2 
+                              "  namespace ns1\0a" 
+                              " ; \0a" 
+                              "cReate namesPace db1.db1-ns1\0a" 
+                              m-cmnt-3
+                              ==
 ++  test-multiline-cmnt-01
   =/  expected1  [%create-namespace database-name='other-db' name='ns1' as-of=~]
   =/  expected2  [%create-namespace database-name='db1' name='db1-ns1' as-of=~]
   %+  expect-eq
     !>  ~[expected1 expected2]
-    !>  (parse:parse(default-database 'other-db') (zing (limo ~["cReate\0a" m-cmnt-1 "  namespace ns1\0a" m-cmnt-2 " ; \0a" m-cmnt-3 "cReate namesPace db1.db1-ns1\0a"])))
+    !>  %-  parse:parse(default-database 'other-db') 
+            %-  zing 
+                %-  limo  :~  "cReate\0a" 
+                              m-cmnt-1 
+                              "  namespace ns1\0a" 
+                              m-cmnt-2 
+                              " ; \0a" 
+                              m-cmnt-3 
+                              "cReate namesPace db1.db1-ns1\0a"
+                              ==
+
 ++  test-multiline-cmnt-02
   =/  expected1  [%create-namespace database-name='other-db' name='ns1' as-of=~]
   =/  expected2  [%create-namespace database-name='db1' name='db1-ns1' as-of=~]
   %+  expect-eq
     !>  ~[expected1 expected2]
-    !>  (parse:parse(default-database 'other-db') (zing (limo ~[m-cmnt-1 "\0acReate\0a" "  namespace ns1\0a" m-cmnt-2 m-cmnt-3 " ; \0a" "cReate namesPace db1.db1-ns1\0a"])))
+    !>  %-  parse:parse(default-database 'other-db') 
+            %-  zing 
+                %-  limo  :~  m-cmnt-1 
+                              "\0acReate\0a" 
+                              "  namespace ns1\0a" 
+                              m-cmnt-2 
+                              m-cmnt-3 
+                              " ; \0a" 
+                              "cReate namesPace db1.db1-ns1\0a"
+                              ==
+
 ++  test-multiline-cmnt-03
   =/  expected1  [%create-namespace database-name='other-db' name='ns1' as-of=~]
   =/  expected2  [%create-namespace database-name='db1' name='db1-ns1' as-of=~]
   %+  expect-eq
     !>  ~[expected1 expected2]
-    !>  (parse:parse(default-database 'other-db') (zing (limo ~["cReate\0a" "  namespace ns1\0a" m-cmnt-1 " ; \0a" m-cmnt-2 "cReate namesPace db1.db1-ns1\0a" m-cmnt-3])))
+    !>  %-  parse:parse(default-database 'other-db') 
+            %-  zing 
+                %-  limo  :~  "cReate\0a" 
+                              "  namespace ns1\0a" 
+                              m-cmnt-1 
+                              " ; \0a" 
+                              m-cmnt-2 
+                              "cReate namesPace db1.db1-ns1\0a" 
+                              m-cmnt-3
+                              ==
+
 ++  test-multiline-cmnt-04
   =/  expected1  [%create-namespace database-name='other-db' name='ns1' as-of=~]
   =/  expected2  [%create-namespace database-name='db1' name='db1-ns1' as-of=~]
   %+  expect-eq
     !>  ~[expected1 expected2]
-    !>  (parse:parse(default-database 'other-db') (zing (limo ~["cReate\0a" "  namespace ns1" m-cmnt-1 " ; " m-cmnt-2 "cReate namesPace db1.db1-ns1" m-cmnt-3])))
---
\ No newline at end of file
+    !>  %-  parse:parse(default-database 'other-db') 
+            %-  zing 
+                %-  limo  :~  "cReate\0a" 
+                              "  namespace ns1\0a" 
+                              m-cmnt-1 
+                              " ; " 
+                              m-cmnt-2 
+                              "cReate namesPace db1.db1-ns1" 
+                              m-cmnt-3
+                              ==
+::
+++  vfas-tar  [%selected-value value=[p=~.t q=10.799] alias=~]
+++  vhep-hep  [%selected-value value=[p=~.t q=11.565] alias=~]
+++  vtar-fas  [%selected-value value=[p=~.t q=12.074] alias=~]
+++  va-fas-tar-a  [%selected-value value=[p=~.t q=539.635.488] alias=~]
+++  va-hep-hep-a  [%selected-value value=[p=~.t q=539.831.584] alias=~]
+++  va-tar-fas-a  [%selected-value value=[p=~.t q=539.961.888] alias=~]
+::
+++  s1  ~[vfas-tar vtar-fas vhep-hep va-fas-tar-a va-tar-fas-a va-hep-hep-a]
+++  s2  ~[va-hep-hep-a vfas-tar vtar-fas vhep-hep va-fas-tar-a va-tar-fas-a]
+++  s3  ~[va-tar-fas-a va-hep-hep-a vfas-tar vtar-fas vhep-hep va-fas-tar-a]
+::
+++  q1  [%query from=~ scalars=~ predicate=~ group-by=~ having=~ selection=[%select top=~ bottom=~ columns=s1] order-by=~]
+++  q2  [%query from=~ scalars=~ predicate=~ group-by=~ having=~ selection=[%select top=~ bottom=~ columns=s2] order-by=~]
+++  q3  [%query from=~ scalars=~ predicate=~ group-by=~ having=~ selection=[%select top=~ bottom=~ columns=s3] order-by=~]
+::
+++  t1  [%transform ctes=~ set-functions=[q1 ~ ~]]
+++  t2  [%transform ctes=~ set-functions=[q2 ~ ~]]
+++  t3  [%transform ctes=~ set-functions=[q3 ~ ~]]
+::
+++  test-multiline-cmnt-05
+  %+  expect-eq
+    !>  ~[t1 t2 t3]
+    !>  %-  parse:parse(default-database 'other-db') 
+            %-  zing 
+                %-  limo  :~  "select '\2f\2a', '*\2f', '--', ' \2f\2a ', ' *\2f ', ' -- '\0a" 
+                              m-cmnt-1 
+                              "select ' -- ', '\2f\2a', '*\2f', '--', ' \2f\2a ', ' *\2f '" 
+                              m-cmnt-2 
+                              "select ' *\2f ', ' -- ', '\2f\2a', '*\2f', '--', ' \2f\2a '"  
+                              m-cmnt-3
+                              ==
+--