diff --git a/source/Ox.Geo/Ox.Geo.js b/source/Ox.Geo/Ox.Geo.js
index 54433479..4d0e2127 100644
--- a/source/Ox.Geo/Ox.Geo.js
+++ b/source/Ox.Geo/Ox.Geo.js
@@ -6,10 +6,15 @@ Ox.load.Geo = function(options, callback) {
 
         /*@
         Ox.COUNTRIES <[o]> Array of countries
-            See http://en.wikipedia.org/wiki/List_of_sovereign_states,
-            http://en.wikipedia.org/wiki/ISO_3166-3 and http://www.imdb.com/country/
+            A list of independent (or de-facto independent) countries and
+            dependencies (see
+            <a href="http://en.wikipedia.org/wiki/List_of_sovereign_states">Wikipedia</a>),
+            other entities with
+            <a href="http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2">ISO 3166-1 alpha-2</a>
+            country codes, and former countries according to <a href="http://en.wikipedia.org/wiki/ISO_3166-3">ISO 3166-3</a>
+            and <a href="http://www.imdb.com/country/">IMDb</a>.
             area <n> Area of the country in square meters
-            code <s> ISO 3166 country code
+            code <s> ISO 3166-1 alpha-2 country code
             dependencies <[s]> Array of dependencies of the country (country codes)
             dependency <[s]> Array of countries the country is a dependency of (country codes)
             east <n> Longitude of eastern boundary in deg
diff --git a/source/Ox.UI/js/Core/Ox.Container.js b/source/Ox.UI/js/Core/Ox.Container.js
index 1deeb62d..02ea6ef4 100644
--- a/source/Ox.UI/js/Core/Ox.Container.js
+++ b/source/Ox.UI/js/Core/Ox.Container.js
@@ -9,9 +9,12 @@ Ox.Container = function(options, self) {
     var that = new Ox.Element({}, self)
         .options(options || {})
         .addClass('OxContainer');
-    that.$content = new Ox.Element({}, self)
+    that.$content = new Ox.Element({})
         .options(options || {})
         .addClass('OxContent')
-        .appendTo(that);
+        /*.appendTo(that)*/;
+    that.append(that.$content);
+    // FIXME: that.append(that.$content) works, but
+    // that.$content.appendTo(that) is broken in Safari
     return that;
 };
diff --git a/source/Ox.UI/js/Core/Ox.DocPage.js b/source/Ox.UI/js/Core/Ox.DocPage.js
index 6167fea0..d2d84dee 100644
--- a/source/Ox.UI/js/Core/Ox.DocPage.js
+++ b/source/Ox.UI/js/Core/Ox.DocPage.js
@@ -30,7 +30,7 @@ Ox.DocPage = function(options, self) {
             .html(
                 '<code><b>' + (name || item.name) + '</b> ' +
                 '&lt;' + item.types.join('&gt;</code> or <code>&lt;') + '&gt; </code>' +
-                (item.default ? 'default: <code>' + item.default + ' </code>' : '') +
+                (item['default'] ? 'default: <code>' + item['default'] + ' </code>' : '') +
                 Ox.parseHTML(item.summary)
             )
         ];
diff --git a/source/Ox.UI/js/Core/Ox.Element.js b/source/Ox.UI/js/Core/Ox.Element.js
index 70917532..79acc1e2 100644
--- a/source/Ox.UI/js/Core/Ox.Element.js
+++ b/source/Ox.UI/js/Core/Ox.Element.js
@@ -291,12 +291,12 @@ Ox.Element = function() {
         options <function> Gets or sets the options of an element object
             # Usage
             ()                  -> <obj> all options
-            (key)               -> <val> the value of option[key]
+            (key)               -> <any> the value of option[key]
             (key, value)        -> <obj> this element
-                sets options[key] to value and calls self.setOption(key, value)
+                Sets options[key] to value and calls self.setOption(key, value)
                 if the key/value pair was added or modified
             ({key: value, ...}) -> <obj> this element
-                sets multiple options and calls self.setOption(key, value)
+                Sets multiple options and calls self.setOption(key, value)
                 for every key/value pair that was added or modified
             # Arguments
             key     <str> the name of the option