diff --git a/source/Ox.UI/js/Bar/Ox.Bar.js b/source/Ox.UI/js/Bar/Ox.Bar.js
index 3f6edbc1..e388209b 100644
--- a/source/Ox.UI/js/Bar/Ox.Bar.js
+++ b/source/Ox.UI/js/Bar/Ox.Bar.js
@@ -5,8 +5,8 @@ Ox.Bar <f:Ox.Element> Bar
     (options) ->       <o> Bar object
     (options, self) -> <o> Bar object
     options <o> Options object
-        orientation <s|horizontal>
-        size        <s|medium> can be small, medium, large or number
+        orientation <s|'horizontal'>
+        size        <s|'medium'> can be small, medium, large or number
     self    <o> Shared private variable
 @*/
 Ox.Bar = function(options, self) {
diff --git a/source/Ox.UI/js/Bar/Ox.Progressbar.js b/source/Ox.UI/js/Bar/Ox.Progressbar.js
index 6fa3c6d3..8d7bdfa2 100644
--- a/source/Ox.UI/js/Bar/Ox.Progressbar.js
+++ b/source/Ox.UI/js/Bar/Ox.Progressbar.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /*@
-Ox.Progressbar <f> Progress Bar
+Ox.Progressbar <f:Ox.Element> Progress Bar
     () -> <o> Progress Bar
     (options) -> <o> Progress Bar
     (options, self) -> <o> Progress Bar
@@ -241,4 +241,4 @@ Ox.Progressbar = function(options, self) {
 
     return that;
 
-};
\ No newline at end of file
+};
diff --git a/source/Ox.UI/js/Bar/Ox.Toolbar.js b/source/Ox.UI/js/Bar/Ox.Toolbar.js
deleted file mode 100644
index d3d5fa1a..00000000
--- a/source/Ox.UI/js/Bar/Ox.Toolbar.js
+++ /dev/null
@@ -1,11 +0,0 @@
-'use strict';
-/**
-    fixme: no need for this
-*/
-Ox.Toolbar = function(options, self) {
-    self = self || {};
-    var that = Ox.Bar({
-            size: Ox.UI.getBarSize(options.size)
-        }, self);
-    return that;
-};
diff --git a/source/Ox.UI/js/Calendar/Ox.Calendar.js b/source/Ox.UI/js/Calendar/Ox.Calendar.js
index 4a0149bd..7c767343 100644
--- a/source/Ox.UI/js/Calendar/Ox.Calendar.js
+++ b/source/Ox.UI/js/Calendar/Ox.Calendar.js
@@ -1041,8 +1041,8 @@ Ox.Calendar = function(options, self) {
                 - self.options.showToolbar * 24
         );
         self.$content.css({height: self.contentHeight + 'px'});
-        that.$element.find('.OxBackground').empty();
-        that.$element.find('.OxEvent').remove();
+        that.find('.OxBackground').empty();
+        that.find('.OxEvent').remove();
         renderBackground();
         renderTimelines();
         renderOverlay();
diff --git a/source/Ox.UI/js/Calendar/Ox.ListCalendar.js b/source/Ox.UI/js/Calendar/Ox.ListCalendar.js
index 0383fca0..4d1bcd76 100644
--- a/source/Ox.UI/js/Calendar/Ox.ListCalendar.js
+++ b/source/Ox.UI/js/Calendar/Ox.ListCalendar.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /*@
-Ox.ListCalendar <function> List Calendar
+Ox.ListCalendar <f:Ox.Element> List Calendar
     (options[, self]) -> <o> List Calendar
     options <o> Options
     self <o> Shared private variable
diff --git a/source/Ox.UI/js/Code/Ox.DocPage.js b/source/Ox.UI/js/Code/Ox.DocPage.js
index d3f13582..74f40260 100644
--- a/source/Ox.UI/js/Code/Ox.DocPage.js
+++ b/source/Ox.UI/js/Code/Ox.DocPage.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /*@
-Ox.DocPage <f> DocPage
+Ox.DocPage <f:Ox.Element> DocPage
     () ->              <o> DocPage object
     (options) ->       <o> DocPage object
     (options, self) -> <o> DocPage object
diff --git a/source/Ox.UI/js/Code/Ox.DocPanel.js b/source/Ox.UI/js/Code/Ox.DocPanel.js
index 4ddb7029..bb0cbf44 100644
--- a/source/Ox.UI/js/Code/Ox.DocPanel.js
+++ b/source/Ox.UI/js/Code/Ox.DocPanel.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /*@
-Ox.DocPanel <f> Documentation Panel
+Ox.DocPanel <f:Ox.Element> Documentation Panel
     () ->              <f> Documentation Panel
     (options) ->       <f> Documentation Panel
     (options, self) -> <f> Documentation Panel
diff --git a/source/Ox.UI/js/Code/Ox.ExamplePage.js b/source/Ox.UI/js/Code/Ox.ExamplePage.js
index a75b8448..aa8057ba 100644
--- a/source/Ox.UI/js/Code/Ox.ExamplePage.js
+++ b/source/Ox.UI/js/Code/Ox.ExamplePage.js
@@ -1,7 +1,7 @@
 'use strict'
 
 /*@
-Ox.ExamaplePage <function> Example Page
+Ox.ExamaplePage <f:Ox.Element> Example Page
     (options[, self]) -> <o> Example Page
     options <o> Options
     self <o> Shared private variable
diff --git a/source/Ox.UI/js/Code/Ox.ExamplePanel.js b/source/Ox.UI/js/Code/Ox.ExamplePanel.js
index a2f03aeb..ad3fe60c 100644
--- a/source/Ox.UI/js/Code/Ox.ExamplePanel.js
+++ b/source/Ox.UI/js/Code/Ox.ExamplePanel.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /*@
-Ox.ExamaplePanel <function> Example Panel
+Ox.ExamaplePanel <f:Ox.Element> Example Panel
     (options[, self]) -> <o> Example Panel
     options <o> Options
     self <o> Shared private variable
diff --git a/source/Ox.UI/js/Code/Ox.SourceViewer.js b/source/Ox.UI/js/Code/Ox.SourceViewer.js
index e9f4106a..0413126d 100644
--- a/source/Ox.UI/js/Code/Ox.SourceViewer.js
+++ b/source/Ox.UI/js/Code/Ox.SourceViewer.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /*@
-Ox.SourceViewer <function> Source Viewer
+Ox.SourceViewer <f:Ox.Container> Source Viewer
     (options[, self]) -> <o> Source Viewer
     options <o> Options
     self <o> Shared private variable
diff --git a/source/Ox.UI/js/Code/Ox.SyntaxHighlighter.js b/source/Ox.UI/js/Code/Ox.SyntaxHighlighter.js
index 216d07d9..005a627b 100644
--- a/source/Ox.UI/js/Code/Ox.SyntaxHighlighter.js
+++ b/source/Ox.UI/js/Code/Ox.SyntaxHighlighter.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /*@
-Ox.SyntaxHighlighter <function> Syntax Highlighter
+Ox.SyntaxHighlighter <f:Ox.Element> Syntax Highlighter
     (options[, self]) -> <o> Syntax Highlighter
     options <o> Options
         lineLength <n|0> If larger than zero, show edge of page
diff --git a/source/Ox.UI/js/Core/Ox.API.js b/source/Ox.UI/js/Core/Ox.API.js
index 80f3b25d..aae66f50 100644
--- a/source/Ox.UI/js/Core/Ox.API.js
+++ b/source/Ox.UI/js/Core/Ox.API.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /*@
-Ox.API <o> bind remote api to object
+Ox.API <f> bind remote api to object
 options <o> Options object
     timeout  <n|60000>   request timeout
     url      <s>         request url
diff --git a/source/Ox.UI/js/Core/Ox.App.js b/source/Ox.UI/js/Core/Ox.App.js
index ebd36880..c99329c9 100644
--- a/source/Ox.UI/js/Core/Ox.App.js
+++ b/source/Ox.UI/js/Core/Ox.App.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /*@
-Ox.App <f> Basic application instance that communicates with a JSON API
+Ox.App <f:Ox.Element> Basic application instance that communicates with a JSON API
     () ->              <f> App object
     (options) ->       <f> App object
     options <o> Options object
diff --git a/source/Ox.UI/js/Core/Ox.Clipboard.js b/source/Ox.UI/js/Core/Ox.Clipboard.js
index 93cb0270..124a8c7e 100644
--- a/source/Ox.UI/js/Core/Ox.Clipboard.js
+++ b/source/Ox.UI/js/Core/Ox.Clipboard.js
@@ -7,7 +7,7 @@ Ox.Clipboard <o> Basic clipboard handler
     paste <f> Paste data from clipboard
         () -> <*> Clipboard data
 @*/
-Ox.Clipboard = function() {
+Ox.Clipboard = (function() {
     var clipboard = {};
     return {
         _print: function() {
@@ -24,4 +24,4 @@ Ox.Clipboard = function() {
             return type in clipboard;
         }
     };
-}();
+})();
diff --git a/source/Ox.UI/js/Core/Ox.Container.js b/source/Ox.UI/js/Core/Ox.Container.js
index 644bda67..e06cce81 100644
--- a/source/Ox.UI/js/Core/Ox.Container.js
+++ b/source/Ox.UI/js/Core/Ox.Container.js
@@ -5,7 +5,7 @@
 // 0, 1, 2, etc, so that append would append 0, and appendTo
 // would append (length - 1)?
 /*@
-Ox.Container <f> Container element
+Ox.Container <f:Ox.Element> Container element
     () ->              <o> Container object
     (options) ->       <o> Container object
     (options, self) -> <o> Container object
diff --git a/source/Ox.UI/js/Core/Ox.Element.js b/source/Ox.UI/js/Core/Ox.Element.js
index 649e96e7..793e6764 100644
--- a/source/Ox.UI/js/Core/Ox.Element.js
+++ b/source/Ox.UI/js/Core/Ox.Element.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /*@
-Ox.Element <function:Ox.JQueryElement> Basic UI element object
+Ox.Element <f:Ox.JQueryElement> Basic UI element object
     # Usage --------------------------------------------------------------------
     (element)       -> <object> UI element
     (options)       -> <object> UI element
@@ -398,7 +398,7 @@ Ox.Element = function(options, self) {
         () -> <obj> This element
     @*/
     that.remove = function(remove) {
-        remove !== false && that.$element.find('.OxElement').each(function() {
+        remove !== false && that.find('.OxElement').each(function() {
             var oxid = $(this).data('oxid'),
                 element = Ox.UI.elements[oxid];
             element && element.remove(false);
diff --git a/source/Ox.UI/js/Core/Ox.GarbageCollection.js b/source/Ox.UI/js/Core/Ox.GarbageCollection.js
index 51e62a9f..5446a0f6 100644
--- a/source/Ox.UI/js/Core/Ox.GarbageCollection.js
+++ b/source/Ox.UI/js/Core/Ox.GarbageCollection.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /*@
-Ox.GarbageCollection <function> GarbageCollection
+Ox.GarbageCollection <f> GarbageCollection
     () -> <o> run garbage collection
     debug() -> {} output debug information
 @*/
diff --git a/source/Ox.UI/js/Core/Ox.History.js b/source/Ox.UI/js/Core/Ox.History.js
deleted file mode 100644
index e9bb7482..00000000
--- a/source/Ox.UI/js/Core/Ox.History.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/***
-    Ox.History
-***/
-'use strict';
-
diff --git a/source/Ox.UI/js/Core/Ox.JQueryElement.js b/source/Ox.UI/js/Core/Ox.JQueryElement.js
index 2cf8fa6e..f6fce959 100644
--- a/source/Ox.UI/js/Core/Ox.JQueryElement.js
+++ b/source/Ox.UI/js/Core/Ox.JQueryElement.js
@@ -1,13 +1,10 @@
 'use strict';
 
 /*@
-Ox.JQueryElement <function> Wrapper for jQuery
+Ox.JQueryElement <f> Wrapper for jQuery
     ($element) -> <object> Wrapped jQuery DOM element
     $element <object> jQuery DOM Element
 @*/
-
-// fixme: now that children(), find() work, change code to call find directly.
-
 Ox.JQueryElement = function($element) {
     var that = this;
     //@ id <number> Unique id
@@ -50,4 +47,4 @@ Ox.methods($('<div>'), true).forEach(function(method) {
             && Ox.UI.elements[id = ret.data('oxid')]
             ? Ox.UI.elements[id] : ret;
     };
-});
\ No newline at end of file
+});
diff --git a/source/Ox.UI/js/Form/Ox.ArrayEditable.js b/source/Ox.UI/js/Form/Ox.ArrayEditable.js
index 88225802..d2c39904 100644
--- a/source/Ox.UI/js/Form/Ox.ArrayEditable.js
+++ b/source/Ox.UI/js/Form/Ox.ArrayEditable.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /*@
-Ox.ArrayEditable <function> Array Editable
+Ox.ArrayEditable <f:Ox.Element> Array Editable
     (options, self) -> <f> Array Editable
     options <o> Options object
     self <o>    Shared private variable
diff --git a/source/Ox.UI/js/Form/Ox.ArrayInput.js b/source/Ox.UI/js/Form/Ox.ArrayInput.js
index 1a9ef0cc..58f1c333 100644
--- a/source/Ox.UI/js/Form/Ox.ArrayInput.js
+++ b/source/Ox.UI/js/Form/Ox.ArrayInput.js
@@ -1,8 +1,8 @@
 'use strict';
 
 /*@
-Ox.ArrayInput <function> Array input
-    (options, self) -> <f> Array input
+Ox.ArrayInput <f:Ox.Element> Array input
+    (options, self) -> <o> Array input
     options <o> Options object
         label       <s> string, ''
         max         <n> integer, maximum number of items, 0 for all
diff --git a/source/Ox.UI/js/Form/Ox.Button.js b/source/Ox.UI/js/Form/Ox.Button.js
index 9a650fbe..c8cad30b 100644
--- a/source/Ox.UI/js/Form/Ox.Button.js
+++ b/source/Ox.UI/js/Form/Ox.Button.js
@@ -2,9 +2,9 @@
 
 /*@
 Ox.Button <f:Ox.Element> Button Object
-    () ->              <f> Button Object
-    (options) ->       <f> Button Object
-    (options, self) -> <f> Button Object
+    () ->              <o> Button Object
+    (options) ->       <o> Button Object
+    (options, self) -> <o> Button Object
     options <o> Options object
         If a button is both selectable and has two values, its value is the
         selected id, and the second value corresponds to the selected state
diff --git a/source/Ox.UI/js/Form/Ox.ButtonGroup.js b/source/Ox.UI/js/Form/Ox.ButtonGroup.js
index 78afdc36..44eddc66 100644
--- a/source/Ox.UI/js/Form/Ox.ButtonGroup.js
+++ b/source/Ox.UI/js/Form/Ox.ButtonGroup.js
@@ -2,9 +2,9 @@
 
 /*@
 Ox.ButtonGroup <f:Ox.Element> ButtonGroup Object
-    () ->              <f> ButtonGroup Object
-    (options) ->       <f> ButtonGroup Object
-    (options, self) -> <f> ButtonGroup Object
+    () ->              <o> ButtonGroup Object
+    (options) ->       <o> ButtonGroup Object
+    (options, self) -> <o> ButtonGroup Object
     options <o> Options object
         buttons     <a> array of buttons
         max         <n> integer, maximum number of selected buttons, 0 for all
diff --git a/source/Ox.UI/js/Form/Ox.Checkbox.js b/source/Ox.UI/js/Form/Ox.Checkbox.js
index e5cdff4b..1a854fa1 100644
--- a/source/Ox.UI/js/Form/Ox.Checkbox.js
+++ b/source/Ox.UI/js/Form/Ox.Checkbox.js
@@ -2,9 +2,9 @@
 
 /*@
 Ox.Checkbox <f:Ox.Element> Checkbox Element
-    () ->              <f> Checkbox Element
-    (options) ->       <f> Checkbox Element
-    (options, self) -> <f> Checkbox Element
+    () ->              <o> Checkbox Element
+    (options) ->       <o> Checkbox Element
+    (options, self) -> <o> Checkbox Element
     options <o> Options object
         disabled <b> if true, checkbox is disabled
         group <b> if true, checkbox is part of a group
diff --git a/source/Ox.UI/js/Form/Ox.CheckboxGroup.js b/source/Ox.UI/js/Form/Ox.CheckboxGroup.js
index 8ad2f388..564405bc 100644
--- a/source/Ox.UI/js/Form/Ox.CheckboxGroup.js
+++ b/source/Ox.UI/js/Form/Ox.CheckboxGroup.js
@@ -2,9 +2,9 @@
 
 /*@
 Ox.CheckboxGroup <f:Ox.Element> CheckboxGroup Object
-    () ->              <f> CheckboxGroup Object
-    (options) ->       <f> CheckboxGroup Object
-    (options, self) -> <f> CheckboxGroup Object
+    () ->              <o> CheckboxGroup Object
+    (options) ->       <o> CheckboxGroup Object
+    (options, self) -> <o> CheckboxGroup Object
     options <o> Options object
         checkboxes      <a|[]>      array of checkboxes
         max             <n|1>       max selected
diff --git a/source/Ox.UI/js/Form/Ox.ColorInput.js b/source/Ox.UI/js/Form/Ox.ColorInput.js
index b01a0851..560427be 100644
--- a/source/Ox.UI/js/Form/Ox.ColorInput.js
+++ b/source/Ox.UI/js/Form/Ox.ColorInput.js
@@ -2,9 +2,9 @@
 
 /*@
 Ox.ColorInput <f:Ox.InputGroup> ColorInput Element
-    () ->              <f> ColorInput Element
-    (options) ->       <f> ColorInput Element
-    (options, self) -> <f> ColorInput Element
+    () ->              <o> ColorInput Element
+    (options) ->       <o> ColorInput Element
+    (options, self) -> <o> ColorInput Element
     options <o> Options object
         id <s> element id
         value <s|0, 0, 0> rgb value
diff --git a/source/Ox.UI/js/Form/Ox.ColorPicker.js b/source/Ox.UI/js/Form/Ox.ColorPicker.js
index 98f22a38..7b96982c 100644
--- a/source/Ox.UI/js/Form/Ox.ColorPicker.js
+++ b/source/Ox.UI/js/Form/Ox.ColorPicker.js
@@ -2,9 +2,9 @@
 
 /*@
 Ox.ColorPicker <f:Ox.Element> ColorPicker Element
-    () ->              <f> ColorPicker Element
-    (options) ->       <f> ColorPicker Element
-    (options, self) -> <f> ColorPicker Element
+    () ->              <o> ColorPicker Element
+    (options) ->       <o> ColorPicker Element
+    (options, self) -> <o> ColorPicker Element
     options <o> Options object
         id <s> element id
         value <s|0, 0, 0> rgb value
@@ -50,19 +50,18 @@ Ox.ColorPicker = function(options, self) {
                 }
             })
             .appendTo(that);
-        // fixme: make self.$ranges[i].children() work
         if (i == 0) {
             // fixme: this should go into Ox.UI.css
-            self.$ranges[i].$element.children('input.OxOverlapRight').css({
+            self.$ranges[i].children('input.OxOverlapRight').css({
                 MozBorderRadius: 0,
                 WebkitBorderRadius: 0
             });
-            self.$ranges[i].$element.children('input.OxOverlapLeft').css({
+            self.$ranges[i].children('input.OxOverlapLeft').css({
                 MozBorderRadius: '0 8px 0 0',
                 WebkitBorderRadius: '0 8px 0 0'
             });
         } else {
-            self.$ranges[i].$element.children('input').css({
+            self.$ranges[i].children('input').css({
                 MozBorderRadius: 0,
                 WebkitBorderRadius: 0
             });
diff --git a/source/Ox.UI/js/Form/Ox.DateInput.js b/source/Ox.UI/js/Form/Ox.DateInput.js
index 91550f26..f8d4feb1 100644
--- a/source/Ox.UI/js/Form/Ox.DateInput.js
+++ b/source/Ox.UI/js/Form/Ox.DateInput.js
@@ -1,10 +1,8 @@
 'use strict';
 
 /*@
-Ox.DateInput <f:Ox.Element> DateInput Element
-    () ->              <f> DateInput Element
-    (options) ->       <f> DateInput Element
-    (options, self) -> <f> DateInput Element
+Ox.DateInput <f:Ox.InputGroup> DateInput Element
+    ([options[, self]]) -> <o> DateInput Element
     options <o> Options object
         format <s|short> format can be short, medium, long
         value <d> date value, defaults to current date
diff --git a/source/Ox.UI/js/Form/Ox.DateTimeInput.js b/source/Ox.UI/js/Form/Ox.DateTimeInput.js
index 0a112eb5..85c9851f 100644
--- a/source/Ox.UI/js/Form/Ox.DateTimeInput.js
+++ b/source/Ox.UI/js/Form/Ox.DateTimeInput.js
@@ -1,10 +1,8 @@
 'use strict';
 
 /*@
-Ox.DateTimeInput <f:Ox.Element> DateTimeInput Element
-    () ->              <f> DateTimeInput Element
-    (options) ->       <f> DateTimeInput Element
-    (options, self) -> <f> DateTimeInput Element
+Ox.DateTimeInput <f:Ox.InputGroup> DateTimeInput Element
+    ([options[, self]]) -> <o> DateTimeInput Element
     options <o> Options object
         ampm <b|false> false is 24h true is am/pm
         format <s|short> options are short, medium, long
diff --git a/source/Ox.UI/js/Form/Ox.Editable.js b/source/Ox.UI/js/Form/Ox.Editable.js
index a3b5aafc..76c84a37 100644
--- a/source/Ox.UI/js/Form/Ox.Editable.js
+++ b/source/Ox.UI/js/Form/Ox.Editable.js
@@ -1,10 +1,8 @@
 'use strict';
 
 /*@
-Ox.Editable <f> Editable element
-    () ->              <f> Input Element
-    (options) ->       <f> Input Element
-    (options, self) -> <f> Input Element
+Ox.Editable <f:Ox.Element> Editable element
+    ([options[, self]]) -> <o> Input Element
     options <o> Options object
         editing <b|false> If true, loads in editing state
         format <f|null> Format function
diff --git a/source/Ox.UI/js/Form/Ox.FileButton.js b/source/Ox.UI/js/Form/Ox.FileButton.js
index 6a9f49d4..e9fa80be 100644
--- a/source/Ox.UI/js/Form/Ox.FileButton.js
+++ b/source/Ox.UI/js/Form/Ox.FileButton.js
@@ -1,8 +1,8 @@
 'use strict';
 
 /*@
-Ox.FileButton <function> File Button
-    (options[, self]) -> <o> File Button
+Ox.FileButton <f:Ox.Element> File Button
+    ([options[, self]]) -> <o> File Button
     options <o> Options
     self <o> Shared private variable
 @*/
diff --git a/source/Ox.UI/js/Form/Ox.FileInput.js b/source/Ox.UI/js/Form/Ox.FileInput.js
index 65786f88..ef46e180 100644
--- a/source/Ox.UI/js/Form/Ox.FileInput.js
+++ b/source/Ox.UI/js/Form/Ox.FileInput.js
@@ -1,8 +1,8 @@
 'use strict';
 
 /*@
-Ox.FileInput <function> File Input
-    (options[, self]) -> <o> File Input
+Ox.FileInput <f:Ox.Element> File Input
+    ([options[, self]]) -> <o> File Input
     options <o> Options
     self <o> Shared private variable
 @*/
diff --git a/source/Ox.UI/js/Form/Ox.Filter.js b/source/Ox.UI/js/Form/Ox.Filter.js
index 82881f8b..d35b91f7 100644
--- a/source/Ox.UI/js/Form/Ox.Filter.js
+++ b/source/Ox.UI/js/Form/Ox.Filter.js
@@ -1,10 +1,8 @@
 'use strict';
 
 /*@
-Ox.Filter <o> Filter Object
-    () ->              <f> Filter Object
-    (options) ->       <f> Filter Object
-    (options, self) -> <f> Filter Object
+Ox.Filter <f:Ox.Element> Filter Object
+    ([options[, self]]) -> <o> Filter Object
     options <o> Options object
         findKeys <[]|[]> keys
         list <o> list object
diff --git a/source/Ox.UI/js/Form/Ox.Form.js b/source/Ox.UI/js/Form/Ox.Form.js
index 67d469ce..4f10c06e 100644
--- a/source/Ox.UI/js/Form/Ox.Form.js
+++ b/source/Ox.UI/js/Form/Ox.Form.js
@@ -2,9 +2,7 @@
 
 /*@
 Ox.Form <f:Ox.Element> Form Object
-    () ->              <f> Form Object
-    (options) ->       <f> Form Object
-    (options, self) -> <f> Form Object
+    ([options[, self]]) -> <o> Form Object
     options <o> Options object
         error  <s> error
         id     <s> id
diff --git a/source/Ox.UI/js/Form/Ox.FormElementGroup.js b/source/Ox.UI/js/Form/Ox.FormElementGroup.js
index 1e41e61a..bd09f674 100644
--- a/source/Ox.UI/js/Form/Ox.FormElementGroup.js
+++ b/source/Ox.UI/js/Form/Ox.FormElementGroup.js
@@ -2,9 +2,7 @@
 
 /*@
 Ox.FormElementGroup <f:Ox.Element> FormElementGroup Element
-    () ->              <f> FormElementGroup Element
-    (options) ->       <f> FormElementGroup Element
-    (options, self) -> <f> FormElementGroup Element
+    ([options[, self]]) -> <f> FormElementGroup Element
     options <o> Options object
         id <s> element id
         elements <a|[]> elements in group
diff --git a/source/Ox.UI/js/Form/Ox.FormItem.js b/source/Ox.UI/js/Form/Ox.FormItem.js
index 9baa6974..3b7d04cb 100644
--- a/source/Ox.UI/js/Form/Ox.FormItem.js
+++ b/source/Ox.UI/js/Form/Ox.FormItem.js
@@ -2,9 +2,7 @@
 
 /*@
 Ox.FormItem <f:Ox.Element> FormItem Element, wrap form element with an error message
-    () ->              <f> FormItem Element
-    (options) ->       <f> FormItem Element
-    (options, self) -> <f> FormItem Element
+    ([options[, self]]) -> <f> FormItem Element
     options <o> Options object
         element <o|null> element
         error <s> error message
diff --git a/source/Ox.UI/js/Form/Ox.FormPanel.js b/source/Ox.UI/js/Form/Ox.FormPanel.js
index d55d4970..5cfd4e0f 100644
--- a/source/Ox.UI/js/Form/Ox.FormPanel.js
+++ b/source/Ox.UI/js/Form/Ox.FormPanel.js
@@ -1,8 +1,8 @@
 'use strict';
 
 /*@
-Ox.FormPanel <function> Form Panel
-    (options[, self]) -> <o> Form Panel
+Ox.FormPanel <f:Ox.Element> Form Panel
+    ([options[, self]]) -> <o> Form Panel
     options <o> Options
     self <o> Shared private variable
 @*/
diff --git a/source/Ox.UI/js/Form/Ox.Input.js b/source/Ox.UI/js/Form/Ox.Input.js
index 7b787f43..17fd6c13 100644
--- a/source/Ox.UI/js/Form/Ox.Input.js
+++ b/source/Ox.UI/js/Form/Ox.Input.js
@@ -2,9 +2,7 @@
 
 /*@
 Ox.Input <f:Ox.Element> Input Element
-    () ->              <f> Input Element
-    (options) ->       <f> Input Element
-    (options, self) -> <f> Input Element
+    ([options[, self]]) -> <o> Input Element
     options <o> Options object
         arrows                      <b> if true, and type is 'float' or 'int', display arrows
         arrowStep                   <n> step when clicking arrows
diff --git a/source/Ox.UI/js/Form/Ox.InputGroup.js b/source/Ox.UI/js/Form/Ox.InputGroup.js
index 22f55e8c..10b9fefc 100644
--- a/source/Ox.UI/js/Form/Ox.InputGroup.js
+++ b/source/Ox.UI/js/Form/Ox.InputGroup.js
@@ -2,9 +2,7 @@
 
 /*@
 Ox.InputGroup <f:Ox.Element> InputGroup Object
-    () ->              <f> InputGroup Object
-    (options) ->       <f> InputGroup Object
-    (options, self) -> <f> InputGroup Object
+    ([options[, self]]) -> <o> InputGroup Object
     options <o> Options object
         id     <s|''> id
         inputs <a|[]> inputs
diff --git a/source/Ox.UI/js/Form/Ox.InsertHTMLDialog.js b/source/Ox.UI/js/Form/Ox.InsertHTMLDialog.js
index d0071517..248258a3 100644
--- a/source/Ox.UI/js/Form/Ox.InsertHTMLDialog.js
+++ b/source/Ox.UI/js/Form/Ox.InsertHTMLDialog.js
@@ -1,8 +1,8 @@
 'use strict';
 
 /*@
-Ox.InsertHTMLDialog <function> Insert HTML Dialog
-    (options[, self]) -> <o> Insert HTML Dialog
+Ox.InsertHTMLDialog <f:Ox.Dialog> Insert HTML Dialog
+    ([options[, self]]) -> <o> Insert HTML Dialog
     options <o> Options
     self <o> Shared private variable
 @*/
diff --git a/source/Ox.UI/js/Form/Ox.Label.js b/source/Ox.UI/js/Form/Ox.Label.js
index 886858f9..365f5243 100644
--- a/source/Ox.UI/js/Form/Ox.Label.js
+++ b/source/Ox.UI/js/Form/Ox.Label.js
@@ -2,9 +2,7 @@
 
 /*@
 Ox.Label <f:Ox.Element> Label Object
-    () ->              <f> Label Object
-    (options) ->       <f> Label Object
-    (options, self) -> <f> Label Object
+    ([options[, self]]) -> <o> Label Object
     options <o> Options object
 @*/
 Ox.Label = function(options, self) {
diff --git a/source/Ox.UI/js/Form/Ox.ObjectArrayInput.js b/source/Ox.UI/js/Form/Ox.ObjectArrayInput.js
index 5e802e07..cfc15d02 100644
--- a/source/Ox.UI/js/Form/Ox.ObjectArrayInput.js
+++ b/source/Ox.UI/js/Form/Ox.ObjectArrayInput.js
@@ -1,8 +1,8 @@
 'use strict';
 
 /*@
-Ox.ObjectArrayInput <function> Object Array Input
-    (options[, self]) -> <o> Object Array Input
+Ox.ObjectArrayInput <f:Ox.Element> Object Array Input
+    ([options[, self]]) -> <o> Object Array Input
     options <o> Options
         buttonTitles
         inputs
diff --git a/source/Ox.UI/js/Form/Ox.ObjectInput.js b/source/Ox.UI/js/Form/Ox.ObjectInput.js
index fbaaf655..bc584a12 100644
--- a/source/Ox.UI/js/Form/Ox.ObjectInput.js
+++ b/source/Ox.UI/js/Form/Ox.ObjectInput.js
@@ -1,8 +1,8 @@
 'use strict';
 
 /*@
-Ox.ObjectInput <function> Object Input
-    (options[, self]) -> <o> Object Input
+Ox.ObjectInput <f:Ox.Element> Object Input
+    ([options[, self]]) -> <o> Object Input
     options <o> Options
     self <o> Shared private variable
 @*/
diff --git a/source/Ox.UI/js/Form/Ox.Picker.js b/source/Ox.UI/js/Form/Ox.Picker.js
index 520fecad..c4b2ecda 100644
--- a/source/Ox.UI/js/Form/Ox.Picker.js
+++ b/source/Ox.UI/js/Form/Ox.Picker.js
@@ -2,9 +2,7 @@
 
 /*@
 Ox.Picker <f:Ox.Element> Picker Object
-    () ->              <f> Picker Object
-    (options) ->       <f> Picker Object
-    (options, self) -> <f> Picker Object
+    ([options[, self]]) -> <o> Picker Object
     options <o> Options object
         element <o|null> picker element
         elementHeight <n|128> height
diff --git a/source/Ox.UI/js/Form/Ox.PlaceInput.js b/source/Ox.UI/js/Form/Ox.PlaceInput.js
index 58391c11..d2e9ccfd 100644
--- a/source/Ox.UI/js/Form/Ox.PlaceInput.js
+++ b/source/Ox.UI/js/Form/Ox.PlaceInput.js
@@ -2,9 +2,7 @@
 
 /*@
 Ox.PlaceInput <f:Ox.FormElementGroup> PlaceInput Object
-    () ->              <f> PlaceInput Object
-    (options) ->       <f> PlaceInput Object
-    (options, self) -> <f> PlaceInput Object
+    ([options[, self]]) -> <f> PlaceInput Object
     options <o> Options object
         id <s> element id
         value <s|United States> default value of place input
diff --git a/source/Ox.UI/js/Form/Ox.PlacePicker.js b/source/Ox.UI/js/Form/Ox.PlacePicker.js
index 2bf77e6f..f204c2ec 100644
--- a/source/Ox.UI/js/Form/Ox.PlacePicker.js
+++ b/source/Ox.UI/js/Form/Ox.PlacePicker.js
@@ -1,10 +1,8 @@
 'use strict';
 
 /*@
-Ox.PlacePicker <f:Ox.Element> PlacePicker Object
-    () ->              <f> PlacePicker Object
-    (options) ->       <f> PlacePicker Object
-    (options, self) -> <f> PlacePicker Object
+Ox.PlacePicker <f:Ox.Picker> PlacePicker Object
+    ([options[, self]]) -> <o> PlacePicker Object
     options <o> Options object
         id <s> element id
         value <s|United States> default value of place input
@@ -69,17 +67,17 @@ Ox.PlacePicker = function(options, self) {
                 )
         );
 
-    self.$input.$element.children('input[type=text]').css({
+    self.$input.children('input[type=text]').css({
         width: '230px',
         paddingLeft: '2px',
         MozBorderRadius: '0 8px 8px 0',
         WebkitBorderRadius: '0 8px 8px 0'
     });
-    self.$input.$element.children('input[type=image]').css({
+    self.$input.children('input[type=image]').css({
         MozBorderRadius: '0 8px 0 0',
         WebkitBorderRadius: '0 8px 0 0'
     });
-    self.$range.$element.children('input').css({
+    self.$range.children('input').css({
         MozBorderRadius: 0,
         WebkitBorderRadius: 0
     });
diff --git a/source/Ox.UI/js/Form/Ox.Range.js b/source/Ox.UI/js/Form/Ox.Range.js
index 72209a4c..e225d883 100644
--- a/source/Ox.UI/js/Form/Ox.Range.js
+++ b/source/Ox.UI/js/Form/Ox.Range.js
@@ -2,9 +2,7 @@
 
 /*@
 Ox.Range <f:Ox.Element> Range Object
-    () ->              <f> Range Object
-    (options) ->       <f> Range Object
-    (options, self) -> <f> Range Object
+    ([options[, self]]) -> <o> Range Object
     options <o> Options object
         arrows        <b>          if true, show arrows
         arrowStep     <n>          step when clicking arrows
diff --git a/source/Ox.UI/js/Form/Ox.Select.js b/source/Ox.UI/js/Form/Ox.Select.js
index ed6d61f9..c5232589 100644
--- a/source/Ox.UI/js/Form/Ox.Select.js
+++ b/source/Ox.UI/js/Form/Ox.Select.js
@@ -2,9 +2,7 @@
 
 /*@
 Ox.Select <f:Ox.Element> Select Object
-    () ->              <f> Select Object
-    (options) ->       <f> Select Object
-    (options, self) -> <f> Select Object
+    ([options[, self]) -> <o> Select Object
     options <o> Options object
         disabled <b|false> If true, select is disabled
         id <s> Element id
diff --git a/source/Ox.UI/js/Form/Ox.SelectInput.js b/source/Ox.UI/js/Form/Ox.SelectInput.js
index 4ce59714..83b127c4 100644
--- a/source/Ox.UI/js/Form/Ox.SelectInput.js
+++ b/source/Ox.UI/js/Form/Ox.SelectInput.js
@@ -1,8 +1,8 @@
 'use strict';
 
 /*@
-Ox.SelectInput <function> Select Input
-    (options[, self]) -> <o> Select Input
+Ox.SelectInput <f:Ox.FormElementGroup> Select Input
+    ([options[, self]]) -> <o> Select Input
     options <o> Options
     self <o> Shared private variable
 @*/
diff --git a/source/Ox.UI/js/Form/Ox.Spreadsheet.js b/source/Ox.UI/js/Form/Ox.Spreadsheet.js
index 7169beb8..6ae5203a 100644
--- a/source/Ox.UI/js/Form/Ox.Spreadsheet.js
+++ b/source/Ox.UI/js/Form/Ox.Spreadsheet.js
@@ -1,8 +1,8 @@
 'use strict';
 
 /*@
-Ox.Spreadsheet <function> Spreadsheet
-    (options[, self]) -> <o> Spreadsheet
+Ox.Spreadsheet <f:Ox.Element> Spreadsheet
+    ([options[, self]]) -> <o> Spreadsheet
     options <o> Options
     self <o> Shared private variable
 @*/
diff --git a/source/Ox.UI/js/Form/Ox.TimeInput.js b/source/Ox.UI/js/Form/Ox.TimeInput.js
index e3e10e7b..cf7b9730 100644
--- a/source/Ox.UI/js/Form/Ox.TimeInput.js
+++ b/source/Ox.UI/js/Form/Ox.TimeInput.js
@@ -2,9 +2,7 @@
 
 /*@
 Ox.TimeInput <f:Ox.Element> TimeInput Object
-    () ->              <f> TimeInput Object
-    (options) ->       <f> TimeInput Object
-    (options, self) -> <f> TimeInput Object
+    ([options[, self]]) -> <f> TimeInput Object
     options <o> Options object
         ampm <b|false> 24h/ampm
         seconds <b|false> show seconds
diff --git a/source/Ox.UI/js/List/Ox.Chart.js b/source/Ox.UI/js/List/Ox.Chart.js
index 19e60978..627e45b5 100644
--- a/source/Ox.UI/js/List/Ox.Chart.js
+++ b/source/Ox.UI/js/List/Ox.Chart.js
@@ -1,10 +1,8 @@
 'use strict';
 
 /*@
-Ox.Chart <f> Bar Chart
-    () ->              <o> Chart object
-    (options) ->       <o> Chart object
-    (options, self) -> <o> Chart object
+Ox.Chart <f:Ox.Element> Bar Chart
+    ([options[, self]]) -> <o> Chart object
     options <o> Options
         color <[n]|[[n]]|[128, 128, 128]> Bar color
         data <o> {k: v, ...} or {k: {k: v, ...}, ...}
diff --git a/source/Ox.UI/js/List/Ox.IconItem.js b/source/Ox.UI/js/List/Ox.IconItem.js
index a52185ca..550a5be6 100644
--- a/source/Ox.UI/js/List/Ox.IconItem.js
+++ b/source/Ox.UI/js/List/Ox.IconItem.js
@@ -2,9 +2,7 @@
 
 /*@
 Ox.IconItem <f:Ox.Element> IconItem Object
-    () ->              <f> IconItem Object
-    (options) ->       <f> IconItem Object
-    (options, self) -> <f> IconItem Object
+    ([options[, self]]) -> <o> IconItem Object
     options <o> Options object
         borderRadius <n|0> Border radius for icon images
         find <s|''> String to be highlighted
diff --git a/source/Ox.UI/js/List/Ox.IconList.js b/source/Ox.UI/js/List/Ox.IconList.js
index aec37598..de9cf602 100644
--- a/source/Ox.UI/js/List/Ox.IconList.js
+++ b/source/Ox.UI/js/List/Ox.IconList.js
@@ -1,9 +1,7 @@
 'use strict';
 /*@
 Ox.IconList <f:Ox.Element> IconList Object
-    () ->              <f> IconList Object
-    (options) ->       <f> IconList Object
-    (options, self) -> <f> IconList Object
+    ([options[, self]]) -> <o> IconList Object
     options <o> Options object
         borderRadius <n|0> border radius for icon images
         centerSelection <b|false> scroll list so selection is always centered
diff --git a/source/Ox.UI/js/List/Ox.InfoList.js b/source/Ox.UI/js/List/Ox.InfoList.js
index 850b327a..672abeae 100644
--- a/source/Ox.UI/js/List/Ox.InfoList.js
+++ b/source/Ox.UI/js/List/Ox.InfoList.js
@@ -1,8 +1,8 @@
 'use strict';
 
 /*@
-Ox.InfoList <function> Info List
-    (options[, self]) -> <o> Info List
+Ox.InfoList <f:Ox.Element> Info List
+    ([options[, self]]) -> <o> Info List
     options <o> Options
     self <o> Shared private variable
 @*/
diff --git a/source/Ox.UI/js/List/Ox.List.js b/source/Ox.UI/js/List/Ox.List.js
index b4314de8..16a63bd5 100644
--- a/source/Ox.UI/js/List/Ox.List.js
+++ b/source/Ox.UI/js/List/Ox.List.js
@@ -1,10 +1,8 @@
 'use strict';
 
 /*@
-Ox.List <f:Ox.Element> List Element
-    () ->              <f> List Object
-    (options) ->       <f> List Object
-    (options, self) -> <f> List Object
+Ox.List <f:Ox.Container> List Element
+    ([options[, self]]) -> <f> List Object
     options <o> Options object
         centered <b|false> if true, and orientation is 'horizontal',
                                     then keep the selected item centered
diff --git a/source/Ox.UI/js/List/Ox.ListItem.js b/source/Ox.UI/js/List/Ox.ListItem.js
index a73f10ab..b716fbd1 100644
--- a/source/Ox.UI/js/List/Ox.ListItem.js
+++ b/source/Ox.UI/js/List/Ox.ListItem.js
@@ -2,9 +2,7 @@
 
 /*@
 Ox.ListItem <f:Ox.Element> ListItem Object
-    () ->              <f> ListItem Object
-    (options) ->       <f> ListItem Object
-    (options, self) -> <f> ListItem Object
+    ([options[, self]]) -> <o> ListItem Object
     options <o> Options object
         construct <f> construct function
         data <o|{}> item data
diff --git a/source/Ox.UI/js/List/Ox.ListPage.js b/source/Ox.UI/js/List/Ox.ListPage.js
index bf9045e1..28c8ef2c 100644
--- a/source/Ox.UI/js/List/Ox.ListPage.js
+++ b/source/Ox.UI/js/List/Ox.ListPage.js
@@ -2,9 +2,7 @@
 
 /*@
 Ox.ListPage <f:Ox.Element> ListPage Object
-    () ->              <f> ListPage Object
-    (options) ->       <f> ListPage Object
-    (options, self) -> <f> ListPage Object
+    ([options[, self]]) -> <o> ListPage Object
     options <o> Options object
     self    <o> shared private variable
 @*/
diff --git a/source/Ox.UI/js/List/Ox.TextList.js b/source/Ox.UI/js/List/Ox.TextList.js
index fe258bc2..b361424b 100644
--- a/source/Ox.UI/js/List/Ox.TextList.js
+++ b/source/Ox.UI/js/List/Ox.TextList.js
@@ -2,9 +2,7 @@
 
 /*@
 Ox.TextList <f:Ox.Element> TextList Object
-    () ->              <f> TextList Object
-    (options) ->       <f> TextList Object
-    (options, self) -> <f> TextList Object
+    ([options[, self]]) -> <f> TextList Object
     options <o> Options object
         columns <[o]|[]> Columns
             # Fixme: There's probably more...
@@ -759,7 +757,7 @@ Ox.TextList = function(options, self) {
 
     function setWidth() {
         var width = getItemWidth();
-        that.$body.$content.$element.find('.OxItem').css({ // fixme: can we avoid this lookup?
+        that.$body.find('.OxItem').css({ // fixme: can we avoid this lookup?
             width: width + 'px'
         });
         that.$body.$content.css({
diff --git a/source/Ox.UI/js/List/Ox.TreeList.js b/source/Ox.UI/js/List/Ox.TreeList.js
index a7e05776..ba062394 100644
--- a/source/Ox.UI/js/List/Ox.TreeList.js
+++ b/source/Ox.UI/js/List/Ox.TreeList.js
@@ -2,9 +2,7 @@
 
 /*@
 Ox.TreeList <f:Ox.Element> TreeList Object
-    () ->              <f> TreeList Object
-    (options) ->       <f> TreeList Object
-    (options, self) -> <f> TreeList Object
+    ([options[, self]]) -> <o> TreeList Object
     options <o> Options object
         data <f|null> data to be parsed to items, needs documentation
         items <a|[]> array of items
diff --git a/source/Ox.UI/js/Map/Ox.ListMap.js b/source/Ox.UI/js/Map/Ox.ListMap.js
index a0ba2f08..16c4db22 100644
--- a/source/Ox.UI/js/Map/Ox.ListMap.js
+++ b/source/Ox.UI/js/Map/Ox.ListMap.js
@@ -2,9 +2,7 @@
 
 /*@
 Ox.ListMap <f:Ox.Element> ListMap object
-    () ->              <f> ListMap object
-    (options) ->       <f> ListMap object
-    (options, self) -> <f> ListMap object
+    ([options[, self]]) -> <o> ListMap object
     options <o> Options object
         height <n|256> Height in px
         labels <b|false> If true, show labels
diff --git a/source/Ox.UI/js/Map/Ox.Map.js b/source/Ox.UI/js/Map/Ox.Map.js
index 24c6dda2..7e850212 100644
--- a/source/Ox.UI/js/Map/Ox.Map.js
+++ b/source/Ox.UI/js/Map/Ox.Map.js
@@ -1,15 +1,13 @@
 'use strict';
 
 /*@
-Ox.Map <function> Basic map object
+Ox.Map <f:Ox.Element> Basic map object
     # DESCRIPTION --------------------------------------------------------------
     <code>Ox.Map</code> is a wrapper around the
     <a href="http://code.google.com/apis/maps/documentation/javascript/">Google
     Maps API</a>.
     # USAGE --------------------------------------------------------------------
-    () ->              <f> Map object
-    (options) ->       <f> Map object
-    (options, self) -> <f> Map object
+    ([options[, self]]) -> <o> Map object
     # ARGUMENTS ----------------------------------------------------------------
     options <o|{}> options
         clickable       <b|false> If true, clicking on the map finds a place
@@ -1199,7 +1197,7 @@ Ox.Map = function(options, self) {
     };
 
     function setPlaceControls(place) {
-        var $placeControls = that.$element.find('.OxPlaceControl'),
+        var $placeControls = that.find('.OxPlaceControl'),
             country,
             isVisible = self.$placeControls.name.is(':visible');
         if (place) {
@@ -1299,8 +1297,7 @@ Ox.Map = function(options, self) {
     }
 
     function toggleControls() {
-        // fixme: that.find() doesn't work here
-        var $controls = that.$element.find('.OxMapControl');
+        var $controls = that.find('.OxMapControl');
         self.options.showControls = !self.options.showControls;
         if (self.options.showControls) {
             $controls.show().animate({opacity: 1}, 250);
diff --git a/source/Ox.UI/js/Map/Ox.MapImage.js b/source/Ox.UI/js/Map/Ox.MapImage.js
index c8781a78..45a6e8d2 100644
--- a/source/Ox.UI/js/Map/Ox.MapImage.js
+++ b/source/Ox.UI/js/Map/Ox.MapImage.js
@@ -2,9 +2,7 @@
 
 /*@
 Ox.MapImage <f:Ox.Element> MapImage Object
-    () ->              <f> MapImage Object
-    (options) ->       <f> MapImage Object
-    (options, self) -> <f> MapImage Object
+    ([options[, self]]) -> <o> MapImage Object
     options <o> Options object
         height <n|360> image height (px)
         place <o|null> Object with south, west, north and east properties
diff --git a/source/Ox.UI/js/Map/Ox.MapMarkerImage.js b/source/Ox.UI/js/Map/Ox.MapMarkerImage.js
index 488c60ec..72dbd4ec 100644
--- a/source/Ox.UI/js/Map/Ox.MapMarkerImage.js
+++ b/source/Ox.UI/js/Map/Ox.MapMarkerImage.js
@@ -1,8 +1,8 @@
 'use strict';
 
 /*@
-Ox.MapMarkerImage <f:google.maps.MarkerImage> MapMarkerImage Object
-    (options) ->       <f> google.maps.MarkerImage
+Ox.MapMarkerImage <f> MapMarkerImage Object
+    (options) ->       <o> google.maps.MarkerImage
     options <o> Options object
         color <a|[255, 0, 0]> marker color
         mode <s|normal> can be: normal, selected, editing
diff --git a/source/Ox.UI/js/Map/Ox.MapRectangle.js b/source/Ox.UI/js/Map/Ox.MapRectangle.js
index 6034c3ba..5abeaa29 100644
--- a/source/Ox.UI/js/Map/Ox.MapRectangle.js
+++ b/source/Ox.UI/js/Map/Ox.MapRectangle.js
@@ -2,9 +2,7 @@
 
 /*@
 Ox.MapRectangle <f> MapRectangle Object
-    () ->              <f> MapRectangle Object
-    (options) ->       <f> MapRectangle Object
-    (options, self) -> <f> MapRectangle Object
+    ([options[, self]]) -> <f> MapRectangle Object
     options <o> Options object
         map <o|null> map
         place <o|null> place
diff --git a/source/Ox.UI/js/Map/Ox.MapRectangleMarker.js b/source/Ox.UI/js/Map/Ox.MapRectangleMarker.js
index b4646428..a0d88350 100644
--- a/source/Ox.UI/js/Map/Ox.MapRectangleMarker.js
+++ b/source/Ox.UI/js/Map/Ox.MapRectangleMarker.js
@@ -2,9 +2,7 @@
 
 /*@
 Ox.MapRectangleMarker <f> MapRectangleMarker Object
-    () ->              <f> MapRectangleMarker Object
-    (options) ->       <f> MapRectangleMarker Object
-    (options, self) -> <f> MapRectangleMarker Object
+    ([options[, self]]) -> <o> MapRectangleMarker Object
     options <o> Options object
         map <o|null> map
         place <o|null> place
diff --git a/source/Ox.UI/js/Menu/Ox.MainMenu.js b/source/Ox.UI/js/Menu/Ox.MainMenu.js
index d71bc440..db90ff9d 100644
--- a/source/Ox.UI/js/Menu/Ox.MainMenu.js
+++ b/source/Ox.UI/js/Menu/Ox.MainMenu.js
@@ -2,9 +2,7 @@
 
 /*@
 Ox.MainMenu <f:Ox.Bar> MainMenu Object
-    () ->              <f> MainMenu Object
-    (options) ->       <f> MainMenu Object
-    (options, self) -> <f> MainMenu Object
+    ([options[, self]]) -> <o> MainMenu Object
     options <o> Options object
         extras <a|[]> extra menus
         menus <a|[]> submenus
diff --git a/source/Ox.UI/js/Menu/Ox.Menu.js b/source/Ox.UI/js/Menu/Ox.Menu.js
index c6e4efd1..7348c162 100644
--- a/source/Ox.UI/js/Menu/Ox.Menu.js
+++ b/source/Ox.UI/js/Menu/Ox.Menu.js
@@ -2,9 +2,7 @@
 
 /*@
 Ox.Menu <f:Ox.Element> Menu Object
-    () ->              <f> Menu Object
-    (options) ->       <f> Menu Object
-    (options, self) -> <f> Menu Object
+    ([options[, self]]) -> <f> Menu Object
     options <o> Options object
         element  <o>         the element the menu is attached to
         id       <s>        the menu id
diff --git a/source/Ox.UI/js/Menu/Ox.MenuButton.js b/source/Ox.UI/js/Menu/Ox.MenuButton.js
index 8eac9a04..73ba5ee3 100644
--- a/source/Ox.UI/js/Menu/Ox.MenuButton.js
+++ b/source/Ox.UI/js/Menu/Ox.MenuButton.js
@@ -1,10 +1,8 @@
 'use strict';
 
 /*@
-Ox.MenuButton <f> Menu Button
-    () -> <f> Menu Button
-    (options) -> Menu Button
-    (options, self) -> Menu Button
+Ox.MenuButton <f:Ox.Element> Menu Button
+    ([options[, self]]) -> <o> Menu Button
     options <o> Options object
         disabled <b|false> If true, button is disabled
         id <s|''> Element id
@@ -115,36 +113,40 @@ Ox.MenuButton = function(options, self) {
 
     /*@
     checkItem <f> checkItem
-        (id) -> <u> check item with id
+        (id) -> <o> check item with id
     @*/
     that.checkItem = function(id) {
         self.$menu.checkItem(id);
+        return that;
     };
 
     /*@
     disableItem <f> disableItem
-        (id) -> <u> disable item with id
+        (id) -> <o> disable item with id
     @*/
     that.disableItem = function(id) {
         self.$menu.getItem(id).options({disabled: true});
+        return that;
     };
 
     /*@
     enableItem <f> enableItem
-        (id) -> <u> enable item
+        (id) -> <o> enable item
     @*/
     that.enableItem = function(id) {
         self.$menu.getItem(id).options({disabled: false});
+        return that;
     };
 
     /*@
     remove <f> remove
-        () -> <u> remove item
+        () -> <o> remove item
     @*/
     self.superRemove = that.remove;
     that.remove = function() {
         self.$menu.remove();
         self.superRemove();
+        return that;
     };
 
     /*@
@@ -162,6 +164,7 @@ Ox.MenuButton = function(options, self) {
     @*/
     that.uncheckItem = function(id) {
         self.$menu.uncheckItem(id);
+        return that;
     };
 
     return that;
diff --git a/source/Ox.UI/js/Menu/Ox.MenuItem.js b/source/Ox.UI/js/Menu/Ox.MenuItem.js
index b35894c8..17e307f3 100644
--- a/source/Ox.UI/js/Menu/Ox.MenuItem.js
+++ b/source/Ox.UI/js/Menu/Ox.MenuItem.js
@@ -2,9 +2,7 @@
 
 /*@
 Ox.MenuItem <f:Ox.Element> MenuItem Object
-    () ->              <f> MenuItem Object
-    (options) ->       <f> MenuItem Object
-    (options, self) -> <f> MenuItem Object
+    ([options[, self]]) -> <o> MenuItem Object
     options <o> Options object
         bind <a|[]> fixme: what's this?
         checked <f|null> 
diff --git a/source/Ox.UI/js/Panel/Ox.CollapsePanel.js b/source/Ox.UI/js/Panel/Ox.CollapsePanel.js
index 815d0648..35f06e7c 100644
--- a/source/Ox.UI/js/Panel/Ox.CollapsePanel.js
+++ b/source/Ox.UI/js/Panel/Ox.CollapsePanel.js
@@ -2,9 +2,7 @@
 
 /*@
 Ox.CollapsePanel <f:Ox.Panel> CollapsePanel Object
-    () ->              <f> CollapsePanel Object
-    (options) ->       <f> CollapsePanel Object
-    (options, self) -> <f> CollapsePanel Object
+    ([options[, self]]) -> <o> CollapsePanel Object
     options <o> Options object
         collapsed <b|false> collapsed state
         extras <a|[]> panel extras
diff --git a/source/Ox.UI/js/Panel/Ox.Panel.js b/source/Ox.UI/js/Panel/Ox.Panel.js
index d580713b..98d83f48 100644
--- a/source/Ox.UI/js/Panel/Ox.Panel.js
+++ b/source/Ox.UI/js/Panel/Ox.Panel.js
@@ -2,9 +2,7 @@
 
 /*@
 Ox.Panel <f:Ox.Element> Panel Object
-    () ->              <f> Panel Object
-    (options) ->       <f> Panel Object
-    (options, self) -> <f> Panel Object
+    ([options[, self]]) -> <f> Panel Object
     options <o> Options object
     self    <o> shared private variable
 @*/
diff --git a/source/Ox.UI/js/Panel/Ox.TabPanel.js b/source/Ox.UI/js/Panel/Ox.TabPanel.js
index 6f8d6837..dd9b4751 100644
--- a/source/Ox.UI/js/Panel/Ox.TabPanel.js
+++ b/source/Ox.UI/js/Panel/Ox.TabPanel.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /*@
-Ox.TabPanel <f> Tabbed panel
+Ox.TabPanel <f:Ox.Element> Tabbed panel
     (options) -> <o> Panel
     (options, self) -> <o> Panel
     options <o> Options
diff --git a/source/Ox.UI/js/Video/Ox.AnnotationFolder.js b/source/Ox.UI/js/Video/Ox.AnnotationFolder.js
index f744e279..27c2c8f6 100644
--- a/source/Ox.UI/js/Video/Ox.AnnotationFolder.js
+++ b/source/Ox.UI/js/Video/Ox.AnnotationFolder.js
@@ -2,9 +2,7 @@
 
 /*@
 Ox.AnnotationFolder <f:Ox.Element> AnnotationFolder Object
-    () ->              <f> AnnotationFolder Object
-    (options) ->       <f> AnnotationFolder Object
-    (options, self) -> <f> AnnotationFolder Object
+    ([options[, self]]) -> <o> AnnotationFolder Object
     options <o> Options object
         editable <b|false> If true, annotations can be added
         id <s> id
diff --git a/source/Ox.UI/js/Video/Ox.AnnotationPanel.js b/source/Ox.UI/js/Video/Ox.AnnotationPanel.js
index 81dbc759..1ddeaf79 100644
--- a/source/Ox.UI/js/Video/Ox.AnnotationPanel.js
+++ b/source/Ox.UI/js/Video/Ox.AnnotationPanel.js
@@ -1,10 +1,8 @@
 'use strict';
 
 /*@
-Ox.AnnotationPanel <f> Video Annotation Panel
-    () ->              <f> AnnotationPanel Object
-    (options) ->       <f> AnnotationPanel Object
-    (options, self) -> <f> AnnotationPanel Object
+Ox.AnnotationPanel <f:Ox.Element> Video Annotation Panel
+    ([options[, self]]) -> <f> AnnotationPanel Object
     options <o> Options object
         calendarSize <n|256>     calendar size
         clickLink    <f|null>    click link callback
diff --git a/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js b/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js
index 19780334..a61bd45b 100644
--- a/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js
+++ b/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js
@@ -1,8 +1,8 @@
 'use strict';
 
 /*@
-Ox.BlockVideoTimeline <function> Block Video Timeline
-    (options[, self]) -> <o> Block Video Timeline
+Ox.BlockVideoTimeline <f:Ox.Element> Block Video Timeline
+    ([options[, self]]) -> <o> Block Video Timeline
     options <o> Options
     self <o> Shared private variable
 @*/
diff --git a/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js b/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js
index fad59f87..0d9af31e 100644
--- a/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js
+++ b/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /*@
-Ox.SmallVideoTimeline <f> Small Video Timeline
+Ox.SmallVideoTimeline <f:Ox.Element> Small Video Timeline
 @*/
 Ox.SmallVideoTimeline = function(options, self) {
 
diff --git a/source/Ox.UI/js/Video/Ox.SmallVideoTimelineImage.js b/source/Ox.UI/js/Video/Ox.SmallVideoTimelineImage.js
index 78e6922f..e51822ec 100644
--- a/source/Ox.UI/js/Video/Ox.SmallVideoTimelineImage.js
+++ b/source/Ox.UI/js/Video/Ox.SmallVideoTimelineImage.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /*@
-Ox.SmallVideoTimelineImage <function> Small Video Timeline Image
+Ox.SmallVideoTimelineImage <f:Ox.Element> Small Video Timeline Image
     (options[, self]) -> <o> Small Video Timeline Image
     options <o> Options
     self <o> Shared private variable
diff --git a/source/Ox.UI/js/Video/Ox.VideoEditor.js b/source/Ox.UI/js/Video/Ox.VideoEditor.js
index 1525c641..99748379 100644
--- a/source/Ox.UI/js/Video/Ox.VideoEditor.js
+++ b/source/Ox.UI/js/Video/Ox.VideoEditor.js
@@ -6,6 +6,7 @@ Ox.VideoEditor <f:Ox.Element> VideoEditor Object
     (options) ->       <o> VideoEditor Object
     (options, self) -> <o> VideoEditor Object
     options <o> Options object
+        annotationsCalendarSize <n|256>
     self    <o> shared private variable
 @*/
 
diff --git a/source/Ox.UI/js/Video/Ox.VideoEditorPlayer.js b/source/Ox.UI/js/Video/Ox.VideoEditorPlayer.js
index b7194b0f..bb5a201d 100644
--- a/source/Ox.UI/js/Video/Ox.VideoEditorPlayer.js
+++ b/source/Ox.UI/js/Video/Ox.VideoEditorPlayer.js
@@ -2,9 +2,9 @@
 
 /*@
 Ox.VideoEditorPlayer <f:Ox.Element> VideoEditorPlayer Object
-    () ->              <f> VideoEditorPlayer Object
-    (options) ->       <f> VideoEditorPlayer Object
-    (options, self) -> <f> VideoEditorPlayer Object
+    () ->              <o> VideoEditorPlayer Object
+    (options) ->       <o> VideoEditorPlayer Object
+    (options, self) -> <o> VideoEditorPlayer Object
     options <o> Options object
     self    <o> shared private variable
 @*/
@@ -196,15 +196,14 @@ Ox.VideoEditorPlayer = function(options, self) {
     $.browser.mozilla && self.$positionInput.css({
         marginTop: '-19px'
     });
-    // fixme: children doesnt work w/o $element
-    self.$positionInput.$element.children('.OxLabel').each(function(i, element) {
+    self.$positionInput.children('.OxLabel').each(function(i, element) {
         $(this).css({
             width: '22px',
             marginLeft: (i == 0 ? 8 : 0) + 'px',
             background: 'rgb(32, 32, 32)'
         });
     });
-    self.$positionInput.$element.children('div.OxInput').each(function(i) {
+    self.$positionInput.children('div.OxInput').each(function(i) {
         var marginLeft = [-82, -58, -34, -10];
         $(this).css({
             marginLeft: marginLeft[i] + 'px'
diff --git a/source/Ox.UI/js/Video/Ox.VideoElement.js b/source/Ox.UI/js/Video/Ox.VideoElement.js
index 68634ed3..c84f0484 100644
--- a/source/Ox.UI/js/Video/Ox.VideoElement.js
+++ b/source/Ox.UI/js/Video/Ox.VideoElement.js
@@ -2,9 +2,9 @@
 
 /*@
 Ox.VideoElement <f:Ox.Element> VideoElement Object
-    () ->              <f> VideoElement Object
-    (options) ->       <f> VideoElement Object
-    (options, self) -> <f> VideoElement Object
+    () ->              <o> VideoElement Object
+    (options) ->       <o> VideoElement Object
+    (options, self) -> <o> VideoElement Object
     options <o> Options object
     self    <o> shared private variable
 @*/
diff --git a/source/Ox.UI/js/Video/Ox.VideoPanel.js b/source/Ox.UI/js/Video/Ox.VideoPanel.js
index 92ab98e2..35c28868 100644
--- a/source/Ox.UI/js/Video/Ox.VideoPanel.js
+++ b/source/Ox.UI/js/Video/Ox.VideoPanel.js
@@ -1,10 +1,10 @@
 'use strict';
 
 /*@
-Ox.VideoPanelPlayer <f:Ox.Element> VideoPanelPlayer Object
-    () ->              <f> VideoPanelPlayer Object
-    (options) ->       <f> VideoPanelPlayer Object
-    (options, self) -> <f> VideoPanelPlayer Object
+Ox.VideoPanel <f:Ox.Element> VideoPanel Object
+    () ->              <o> VideoPanel Object
+    (options) ->       <o> VideoPanel Object
+    (options, self) -> <o> VideoPanel Object
     options <o> Options object
     self    <o> shared private variable
 @*/
diff --git a/source/Ox.UI/js/Video/Ox.VideoPlayer.js b/source/Ox.UI/js/Video/Ox.VideoPlayer.js
index 19202392..dafe5927 100644
--- a/source/Ox.UI/js/Video/Ox.VideoPlayer.js
+++ b/source/Ox.UI/js/Video/Ox.VideoPlayer.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /*@
-Ox.VideoPlayer <f> Generic Video Player
+Ox.VideoPlayer <f:Ox.Element> Generic Video Player
     (options, self) -> <o> Video Player
     options <o> Options
         annotations <[]> Array of annotations
diff --git a/source/Ox.UI/js/Video/Ox.VideoPreview.js b/source/Ox.UI/js/Video/Ox.VideoPreview.js
index a404465c..e2dd2f69 100644
--- a/source/Ox.UI/js/Video/Ox.VideoPreview.js
+++ b/source/Ox.UI/js/Video/Ox.VideoPreview.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /*@
-Ox.VideoPreview <function> Video Preview
+Ox.VideoPreview <f:Ox.Element> Video Preview
     (options[, self]) -> <o> Video Preview
     options <o> Options
     self <o> Shared private variable
diff --git a/source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js b/source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js
index 516f10e1..6c68f6dd 100644
--- a/source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js
+++ b/source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /*@
-Ox.VideoTimelinePlayer <function> Video Timeline Player
+Ox.VideoTimelinePlayer <f:Ox.Element> Video Timeline Player
     (options[, self]) -> <o> Video Timeline Player
     options <o> Options
     self <o> Shared private variable
diff --git a/source/Ox.UI/js/Window/Ox.Dialog.js b/source/Ox.UI/js/Window/Ox.Dialog.js
index 53cef29a..bc90262d 100644
--- a/source/Ox.UI/js/Window/Ox.Dialog.js
+++ b/source/Ox.UI/js/Window/Ox.Dialog.js
@@ -2,16 +2,10 @@
 
 /*@
 Ox.Dialog <f:Ox.Element> Dialog object
-    () ->              <f> Dialog object
-    (options) ->       <f> Dialog object
-    (options, self) -> <f> Dialog object
+    () ->              <o> Dialog object
+    (options) ->       <o> Dialog object
+    (options, self) -> <o> Dialog object
     options <o> Options object
-        draggable       <b|true> is window draggable
-        fullscreenable  <b|true> fixme: silly name
-        height          <n|200>  height
-        resizeable      <b|true> resizeable
-        scaleable       <b|true> sccaleable
-        width           <n|400>  width
     self <o>    Shared private variable
 @*/
 
diff --git a/source/Ox.UI/js/Window/Ox.Layer.js b/source/Ox.UI/js/Window/Ox.Layer.js
index 462c4678..1ce50498 100644
--- a/source/Ox.UI/js/Window/Ox.Layer.js
+++ b/source/Ox.UI/js/Window/Ox.Layer.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /*@
-Ox.Layer <o> Background layer for dialogs and menus
+Ox.Layer <f:Ox.Element> Background layer for dialogs and menus
     (options, self) -> <o> Layer
     options <o> Options
         type <s|'dialog'> Layer type ('dialog' or 'menu')
diff --git a/source/Ox.UI/js/Window/Ox.Tooltip.js b/source/Ox.UI/js/Window/Ox.Tooltip.js
index 6eb6dff1..b394b395 100644
--- a/source/Ox.UI/js/Window/Ox.Tooltip.js
+++ b/source/Ox.UI/js/Window/Ox.Tooltip.js
@@ -2,9 +2,9 @@
 
 /*@
 Ox.Tooltip <f:Ox.Element> Tooltip Object
-    () ->              <f> Tooltip Object
-    (options) ->       <f> Tooltip Object
-    (options, self) -> <f> Tooltip Object
+    () ->              <o> Tooltip Object
+    (options) ->       <o> Tooltip Object
+    (options, self) -> <o> Tooltip Object
     options <o> Options object
     self    <o> shared private variable
 @*/