diff --git a/.gitignore b/.gitignore
index 68df555f07..31b3fa2c1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,33 +1,34 @@
-*~
-*.gch*
-*.obj
-*.o
-*.s
-*.exe
-Factor/factor
-*.a
-*.dll
-*.lib
-*.exp
-*.res
-*.RES
-*.image
-factor.image.fresh
-*.dylib
-factor.com
 *#*#
-.DS_Store
-.gdb_history
 *.*.marks
+*.RES
+*.a
+*.bak
+*.dll
+*.dylib
+*.exe
+*.exp
+*.gch*
+*.image
+*.lib
+*.o
+*.obj
+*.res
+*.s
+*.so
+*~
+.#*
 .*.swm
 .*.swn
 .*.swo
 .*.swp
-logs
-work
-*.bak
-.#*
-checksums.txt
-*.so
-a.out
+.DS_Store
+.gdb_history
+/factor
+/logs
+/work
+Factor.app/Contents/MacOS/factor
 Factor.app/Contents/_CodeSignature
+a.out
+checksums.txt
+factor.com
+factor.image.fresh
diff --git a/basis/alien/data/data-docs.factor b/basis/alien/data/data-docs.factor
index ffc406ca8c..f7950bae58 100644
--- a/basis/alien/data/data-docs.factor
+++ b/basis/alien/data/data-docs.factor
@@ -74,7 +74,7 @@ $nl
 "If no initial value is specified, the contents of the allocated memory are undefined." }
 { $warning "Reading or writing a scoped allocation buffer outside of the given quotation will cause memory corruption." }
 { $examples
-    { $example
+    { $unchecked-example
         "USING: accessors alien.c-types alien.data
 classes.struct kernel math math.functions
 prettyprint ;
diff --git a/basis/editors/ui/authors.txt b/basis/editors/ui/authors.txt
new file mode 100644
index 0000000000..7c1b2f2279
--- /dev/null
+++ b/basis/editors/ui/authors.txt
@@ -0,0 +1 @@
+Doug Coleman
diff --git a/basis/furnace/auth/auth-docs.factor b/basis/furnace/auth/auth-docs.factor
index 45bcb8a0ec..58317ee29a 100644
--- a/basis/furnace/auth/auth-docs.factor
+++ b/basis/furnace/auth/auth-docs.factor
@@ -121,7 +121,6 @@ $nl
     "furnace.auth.providers.null"
     "furnace.auth.providers.assoc"
     "furnace.auth.providers.db"
-    "furnace.auth.providers.couchdb"
 } ;
 
 ARTICLE: "furnace.auth.features" "Optional authentication features"
diff --git a/basis/furnace/auth/providers/couchdb/couchdb-docs.factor b/basis/furnace/auth/providers/couchdb/couchdb-docs.factor
index ec967f29d9..7481b7ac93 100644
--- a/basis/furnace/auth/providers/couchdb/couchdb-docs.factor
+++ b/basis/furnace/auth/providers/couchdb/couchdb-docs.factor
@@ -25,12 +25,12 @@ HELP: couchdb-auth-provider
 
 ARTICLE: "furnace.auth.providers.couchdb" "CouchDB Authentication Provider"
     "The " { $vocab-link "furnace.auth.providers.couchdb" } " vocabulary implements an authentication provider "
-    "which looks up authentication requests in a CouchDB. It is necessary to create a view "
+    "which looks up authentication requests in CouchDB. It is necessary to create a view "
     "associating usernames with user documents before using this vocabulary; see documentation "
     "for " { $link couchdb-auth-provider } "."
     $nl
     "Although this implementation guarantees that users with duplicate IDs/emails"
-    " cannot be created in a single CouchDB database, it provides so such guarentee if you are clustering "
+    " cannot be created in a single CouchDB database, it provides no such guarantee if you are clustering "
     "multiple DBs. In this case, you are responsible for ensuring the uniqueness of users across "
     "databases."
     $nl
diff --git a/basis/help/tutorial/tutorial.factor b/basis/help/tutorial/tutorial.factor
index 436de3ad2f..91962c282f 100644
--- a/basis/help/tutorial/tutorial.factor
+++ b/basis/help/tutorial/tutorial.factor
@@ -132,7 +132,7 @@ $nl
 { $unchecked-example "\"A man, a plan, a canal: Panama.\" palindrome? ." "f" }
 $nl
 "We would like it to output " { $link t } " there. We can encode this requirement with a unit test that we add to " { $snippet "palindrome-tests.factor" } ":"
-{ $code "[ t ] [ \"A man, a plan, a canal: Panama.\" palindrome? ] unit-test" }
+{ $code "{ t } [ \"A man, a plan, a canal: Panama.\" palindrome? ] unit-test" }
 $nl
 "If you now run unit tests, you will see a unit test failure:"
 { $code "\"palindrome\" test" }
@@ -178,7 +178,7 @@ $nl
 "This code starts with a string on the stack, removes non-alphabetical characters, and converts the result to lower case, leaving a new string on the stack. We put this code in a new word, and add the new word to " { $snippet "palindrome.factor" } ":"
 { $code ": normalize ( string -- string' ) [ Letter? ] filter >lower ;" }
 $nl
-"You will need to add " { $vocab-link "unicode.case" } " and " { $vocab-link "unicode.categories" } " to the vocabulary search path, so that " { $link >lower } " and " { $link Letter? } " can be used in the source file."
+"You will need to add " { $vocab-link "unicode" } " to the vocabulary search path, so that " { $link >lower } " and " { $link Letter? } " can be used in the source file."
 $nl
 "We modify " { $snippet "palindrome?" } " to first apply " { $snippet "normalize" } " to its input:"
 { $code ": palindrome? ( string -- ? ) normalize dup reverse = ;" }
diff --git a/basis/tools/hexdump/hexdump.factor b/basis/tools/hexdump/hexdump.factor
index f2fe69162b..0e72e0c9af 100644
--- a/basis/tools/hexdump/hexdump.factor
+++ b/basis/tools/hexdump/hexdump.factor
@@ -85,8 +85,7 @@ M: byte-vector hexdump. all-bytes underlying>> hexdump-bytes ;
 
 : hexdump-main ( -- )
     command-line get [
-        input-stream get dup decoder? [ stream>> ] when
-        hexdump-stream
+        input-stream get binary re-decode hexdump-stream
     ] [
         [ hexdump-file ] each
     ] if-empty ;