diff --git a/bin/solid.pill b/bin/solid.pill
index 661bf03058..b22b1cab11 100644
--- a/bin/solid.pill
+++ b/bin/solid.pill
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ccd51314cd6c34fc80c4fd667db20089db5de51716e05359f9ecd6570fd69c91
-size 9593928
+oid sha256:6b4ec80306985dde4f8abb2e6d85414685309232aec8dffc4795f5546c2f27f5
+size 9669171
diff --git a/nix/ops/solid/builder.sh b/nix/ops/solid/builder.sh
index 61dfd84b31..d6d5decac0 100755
--- a/nix/ops/solid/builder.sh
+++ b/nix/ops/solid/builder.sh
@@ -36,6 +36,11 @@ herb ./pier -p hood -d "+hood/unmount %home"
 herb ./pier -p hood -d '+hood/merge %stage our %home'
 herb ./pier -p hood -d "+hood/mount /=stage="
 
+until [ -d ./pier/stage ]
+do
+  sleep 1
+done
+
 rm -rf ./pier/stage
 cp -r $ARVO ./pier/stage
 chmod -R u+rw ./pier/stage
diff --git a/pkg/arvo/gen/solid.hoon b/pkg/arvo/gen/solid.hoon
index 19728a6b3b..762f211e2b 100644
--- a/pkg/arvo/gen/solid.hoon
+++ b/pkg/arvo/gen/solid.hoon
@@ -16,7 +16,7 @@
         dub=_|
     ==
 :-  %pill
-%-  pill:pill
+^-  pill:pill
 ::  sys: root path to boot system, `/~me/[desk]/now/sys`
 ::
 =/  sys=path
diff --git a/pkg/arvo/lib/pill.hoon b/pkg/arvo/lib/pill.hoon
index 98dc586b46..1d4e330f5f 100644
--- a/pkg/arvo/lib/pill.hoon
+++ b/pkg/arvo/lib/pill.hoon
@@ -75,7 +75,7 @@
   =/  directories
     `(list path)`~[/app /gen /lib /mar /ren /sec /sur /sys /tests /web]
   |=  bas=path
-  ^-  ovum
+  ^-  unix-event
   ::
   ::    /app    %gall applications
   ::    /gen    :dojo generators
@@ -92,7 +92,7 @@
   |=  ::  sal: all spurs to load from
       ::
       sal/(list spur)
-  ^-  ovum
+  ^-  unix-event
   ::
   ::  hav: all user files
   ::
diff --git a/pkg/arvo/sys/vane/ames.hoon b/pkg/arvo/sys/vane/ames.hoon
index 7198494b0a..c382fb0518 100644
--- a/pkg/arvo/sys/vane/ames.hoon
+++ b/pkg/arvo/sys/vane/ames.hoon
@@ -1369,7 +1369,7 @@
         %milk
       ::  ~&  [%milk p.bon q.bon]
       ?>  ?=([@ @ *] q.q.bon)
-      ?>  ?=(?(%a %c %e %g %j %j) i.q.q.bon)
+      ?>  ?=(?(%a %c %e %g %j) i.q.q.bon)
       =/  =wire  [(scot %p our) (scot %p p.bon) q.q.bon]
       :_  fox  [hen %pass wire i.q.q.bon %west p.bon t.q.q.bon r.bon]~
     ::
diff --git a/pkg/arvo/sys/zuse.hoon b/pkg/arvo/sys/zuse.hoon
index f989653bcc..7c0f582d28 100644
--- a/pkg/arvo/sys/zuse.hoon
+++ b/pkg/arvo/sys/zuse.hoon
@@ -72,9 +72,9 @@
 ++  life  @ud                                           ::  ship key revision
 ++  rift  @ud                                           ::  ship continuity
 ++  mime  {p/mite q/octs}                               ::  mimetyped data
-::  
 ::
-::    TODO: Rename to +mime once the current +mime and +mite are gone. The 
+::
+::    TODO: Rename to +mime once the current +mime and +mite are gone. The
 ::
 ++  octs  {p/@ud q/@t}                                  ::  octet-stream
 ++  sock  {p/ship q/ship}                               ::  outgoing [our his]
@@ -214,7 +214,7 @@
       [%west p=ship q=path r=*]
   ==
 ::                                                      ::::
-::::                      ++http                        ::  
+::::                      ++http                        ::
   ::                                                    ::::
 ::  http: shared representations of http concepts
 ::
@@ -7594,21 +7594,20 @@
       ::  #  diffs
       ::
       ++  update
-        $%  [%full ships=(map ship point) dns=dnses heard=events]  ::TODO  keys
+        $%  [%full ships=(map ship point) dns=dnses heard=events]
             [%difs dis=(list (pair event-id diff-azimuth))]
         ==
       ::
       ::  #  constants
       ::
       ::  contract addresses
-      ::TODO  values below are for ropsten, update for mainnet
-      ++  contracts
+      ++  contracts  mainnet-contracts
+      ++  mainnet-contracts
         |%
         ::  azimuth: data contract
         ::
-        ++  azimuth  0x223c.067f.8cf2.8ae1.73ee.5caf.ea60.ca44.c335.fecb  ::  mainnet
-        ::  ++  azimuth  0x308a.b6a6.024c.f198.b57e.008d.0ac9.ad02.1988.6579  ::  ropsten
-        ::  ++  azimuth  0x863d.9c2e.5c4c.1335.96cf.ac29.d552.55f0.d0f8.6381  ::  local bridge
+        ++  azimuth
+          0x223c.067f.8cf2.8ae1.73ee.5caf.ea60.ca44.c335.fecb
         ::
         ++  linear-star-release
           0x86cd.9cd0.992f.0423.1751.e376.1de4.5cec.ea5d.1801
@@ -7619,13 +7618,23 @@
         ::  launch: block number of azimuth deploy
         ::
         ++  launch  6.784.800
-        ::  ++  launch  4.601.630
         ::
         ::  public: block number of azimuth becoming independent
         ::
         ++  public  7.033.765
         --
       ::
+      ::  Testnet contract addresses
+      ::
+      ++  ropsten-contracts
+        |%
+        ++  azimuth
+          0x308a.b6a6.024c.f198.b57e.008d.0ac9.ad02.1988.6579
+        ::
+        ++  launch  4.601.630
+        --
+      ::
+        ::  ++  azimuth  0x863d.9c2e.5c4c.1335.96cf.ac29.d552.55f0.d0f8.6381  ::  local bridge
       ::  hashes of ship event signatures
       ++  azimuth-events
         |%