diff --git a/basis/furnace/referrer/referrer.factor b/basis/furnace/referrer/referrer.factor
index 56777676fc..4cfd4bb6c6 100644
--- a/basis/furnace/referrer/referrer.factor
+++ b/basis/furnace/referrer/referrer.factor
@@ -1,6 +1,7 @@
-USING: accessors kernel
-http.server http.server.filters http.server.responses
-furnace ;
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: accessors kernel http.server http.server.filters
+http.server.responses furnace ;
 IN: furnace.referrer
 
 TUPLE: referrer-check < filter-responder quot ;
diff --git a/basis/html/templates/chloe/chloe-tests.factor b/basis/html/templates/chloe/chloe-tests.factor
index 4048836cfe..0305b738af 100644
--- a/basis/html/templates/chloe/chloe-tests.factor
+++ b/basis/html/templates/chloe/chloe-tests.factor
@@ -26,7 +26,7 @@ IN: html.templates.chloe.tests
     "?>" split1 nip ; inline
 
 : test-template ( name -- template )
-    "resource:extra/html/templates/chloe/test/"
+    "resource:basis/html/templates/chloe/test/"
     prepend <chloe> ;
 
 [ "Hello world" ] [
diff --git a/basis/html/templates/fhtml/fhtml-tests.factor b/basis/html/templates/fhtml/fhtml-tests.factor
index 43ea28fa55..b863087a92 100755
--- a/basis/html/templates/fhtml/fhtml-tests.factor
+++ b/basis/html/templates/fhtml/fhtml-tests.factor
@@ -4,7 +4,7 @@ tools.test sequences parser ;
 IN: html.templates.fhtml.tests
 
 : test-template ( path -- ? )
-    "resource:extra/html/templates/fhtml/test/"
+    "resource:basis/html/templates/fhtml/test/"
     prepend
     [
         ".fhtml" append <fhtml> [ call-template ] with-string-writer
diff --git a/basis/http/http-tests.factor b/basis/http/http-tests.factor
index 3d0ac51e51..40154e94ef 100755
--- a/basis/http/http-tests.factor
+++ b/basis/http/http-tests.factor
@@ -202,7 +202,7 @@ test-db [
         <dispatcher>
             add-quit-action
             <dispatcher>
-                "resource:extra/http/test" <static> >>default
+                "resource:basis/http/test" <static> >>default
             "nested" add-responder
             <action>
                 [ URL" redirect-loop" <temporary-redirect> ] >>display
@@ -214,7 +214,7 @@ test-db [
 ] unit-test
 
 [ t ] [
-    "resource:extra/http/test/foo.html" ascii file-contents
+    "resource:basis/http/test/foo.html" ascii file-contents
     "http://localhost:1237/nested/foo.html" http-get nip =
 ] unit-test
 
diff --git a/basis/http/parsers/parsers.factor b/basis/http/parsers/parsers.factor
index 746741c894..2a31373951 100644
--- a/basis/http/parsers/parsers.factor
+++ b/basis/http/parsers/parsers.factor
@@ -1,3 +1,5 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
 USING: combinators.short-circuit math math.order math.parser kernel
 sequences sequences.deep peg peg.parsers assocs arrays
 hashtables strings unicode.case namespaces ascii ;
diff --git a/basis/xmode/catalog/catalog.factor b/basis/xmode/catalog/catalog.factor
index 26147c7867..16da4be1d3 100755
--- a/basis/xmode/catalog/catalog.factor
+++ b/basis/xmode/catalog/catalog.factor
@@ -24,7 +24,7 @@ TAGS>
     ] keep ;
 
 MEMO: modes ( -- modes )
-    "resource:extra/xmode/modes/catalog"
+    "resource:basis/xmode/modes/catalog"
     file>xml parse-modes-tag ;
 
 MEMO: mode-names ( -- modes )
@@ -36,7 +36,7 @@ MEMO: mode-names ( -- modes )
 MEMO: (load-mode) ( name -- rule-sets )
     modes at [
         file>>
-        "resource:extra/xmode/modes/" prepend
+        "resource:basis/xmode/modes/" prepend
         utf8 <file-reader> parse-mode
     ] [
         "text" (load-mode)
diff --git a/basis/xmode/code2html/code2html.factor b/basis/xmode/code2html/code2html.factor
index 028d9b62ba..032b2b25f0 100755
--- a/basis/xmode/code2html/code2html.factor
+++ b/basis/xmode/code2html/code2html.factor
@@ -20,7 +20,7 @@ IN: xmode.code2html
 
 : default-stylesheet ( -- )
     <style>
-        "resource:extra/xmode/code2html/stylesheet.css"
+        "resource:basis/xmode/code2html/stylesheet.css"
         utf8 file-contents escape-string write
     </style> ;
 
diff --git a/basis/xmode/utilities/utilities-tests.factor b/basis/xmode/utilities/utilities-tests.factor
index e4946701dd..45238ca2b1 100755
--- a/basis/xmode/utilities/utilities-tests.factor
+++ b/basis/xmode/utilities/utilities-tests.factor
@@ -47,6 +47,6 @@ TAGS>
         "PUBLIC"
     }
 ] [
-    "resource:extra/xmode/utilities/test.xml"
+    "resource:basis/xmode/utilities/test.xml"
     file>xml parse-company-tag
 ] unit-test
diff --git a/extra/webapps/wiki/initial-content/Farkup.txt b/extra/webapps/wiki/initial-content/Farkup.txt
index 8814af6c0a..9c1fb5e7db 100644
--- a/extra/webapps/wiki/initial-content/Farkup.txt
+++ b/extra/webapps/wiki/initial-content/Farkup.txt
@@ -16,10 +16,14 @@ Images can be embedded in the text:
 
 [[image:http://factorcode.org/graphics/logo.png]]
 
+Lists:
+
 - a list
 - with three
 - items
 
+Tables:
+
 |a table|with|four|columns|
 |and|two|rows|...|
 
diff --git a/extra/websites/concatenative/concatenative.factor b/extra/websites/concatenative/concatenative.factor
index 1ae7f63a27..11d8fa27c2 100644
--- a/extra/websites/concatenative/concatenative.factor
+++ b/extra/websites/concatenative/concatenative.factor
@@ -76,8 +76,8 @@ SYMBOL: dh-file
     init-factor-db ;
 
 : init-testing ( -- )
-    "resource:extra/openssl/test/dh1024.pem" dh-file set-global
-    "resource:extra/openssl/test/server.pem" key-file set-global
+    "resource:basis/openssl/test/dh1024.pem" dh-file set-global
+    "resource:basis/openssl/test/server.pem" key-file set-global
     "password" key-password set-global
     common-configuration ;