diff --git a/examples/Circles.elm b/examples/Circles.elm
index 87fa47b..024dbe8 100644
--- a/examples/Circles.elm
+++ b/examples/Circles.elm
@@ -25,7 +25,7 @@ svg ds ms =
 circles : Widget (number, number) number
 circles =
   selectAll "circle"
-  |= (\(x, y) -> repeat (x `div` 50) y)
+  |= (\(x, y) -> repeat (x // 50) y)
      |- enter <.> append "circle"
         |. fun attr "fill" color
         |. num attr "r"    0
diff --git a/examples/Voronoi.elm b/examples/Voronoi.elm
index e470a42..5b7639c 100644
--- a/examples/Voronoi.elm
+++ b/examples/Voronoi.elm
@@ -72,7 +72,7 @@ voronoi =
      |- enter <.> append "path"
      |- update
         |. fun attr "d" (\ps _ -> path ps)
-        |. fun attr "class" (\_ i -> "q" ++ (show (mod i 9)) ++ "-9")
+        |. fun attr "class" (\_ i -> "q" ++ (show ((%) i 9)) ++ "-9")
 
 cells : [D3.Voronoi.Point] -> [[D3.Voronoi.Point]]
 cells = D3.Voronoi.cellsWithClipping margin.right margin.top dims.width dims.height
diff --git a/src/D3.elm b/src/D3.elm
index 06c48c5..a8c85ea 100644
--- a/src/D3.elm
+++ b/src/D3.elm
@@ -28,6 +28,12 @@ module D3
   , delay                   -- : (a -> Int -> Int) -> Selection a
   , duration                -- : (a -> Int -> Int) -> Selection a
   , Selection
+  , Widget
+  , (|.)
+  , (<.>)
+  , (|^)
+  , (|-)
+  , (|=)
   ) where
 
 import Json(..)
diff --git a/src/D3/Event.elm b/src/D3/Event.elm
index 4ed70e4..2378559 100644
--- a/src/D3/Event.elm
+++ b/src/D3/Event.elm
@@ -20,6 +20,7 @@ module D3.Event
 
   , focus       -- : BasicHandler e a
   , blur        -- : BasicHandler e a
+  , Stream
   ) where
 
 import D3(..)
diff --git a/src/D3/Voronoi.elm b/src/D3/Voronoi.elm
index a03f91e..81f30c8 100644
--- a/src/D3/Voronoi.elm
+++ b/src/D3/Voronoi.elm
@@ -1,6 +1,7 @@
 module D3.Voronoi
   ( cells
   , cellsWithClipping
+  , Point
   ) where
 
 import Native.D3.Voronoi