From 66d338aec5d632927fa561a68310c8931938e9e0 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jodersky@gmail.com>
Date: Sun, 13 Dec 2009 16:06:50 +0000
Subject: Ported to scala 2.8.

---
 doc/all-classes.html                               |  143 --
 doc/graphyx$content.html                           |   21 -
 doc/graphyx$package.html                           |   14 -
 doc/graphyx/Graphyx$.html                          |  204 +++
 doc/graphyx/Graphyx$object.html                    |  221 ---
 doc/graphyx/actors$content.html                    |  100 --
 doc/graphyx/actors$package.html                    |   22 -
 doc/graphyx/actors/Exit$.html                      |  177 +++
 doc/graphyx/actors/Exit$object.html                |  205 ---
 doc/graphyx/actors/FireEvent$.html                 |  177 +++
 doc/graphyx/actors/FireEvent$object.html           |  205 ---
 doc/graphyx/actors/GUIActor.html                   |  467 ++++--
 doc/graphyx/actors/PhysicsActor.html               |  521 ++++---
 doc/graphyx/actors/SetWorld$object.html            |   82 -
 doc/graphyx/actors/SetWorld.html                   |  477 +++---
 doc/graphyx/actors/Start$.html                     |  177 +++
 doc/graphyx/actors/Start$object.html               |  205 ---
 doc/graphyx/actors/Stop$.html                      |  177 +++
 doc/graphyx/actors/Stop$object.html                |  205 ---
 doc/graphyx/actors/package.html                    |  113 ++
 doc/graphyx/graphics$content.html                  |  332 ----
 doc/graphyx/graphics$package.html                  |   43 -
 doc/graphyx/graphics/Drawable.html                 |  708 ++++-----
 doc/graphyx/graphics/GraphicalAABB$object.html     |   82 -
 doc/graphyx/graphics/GraphicalAABB.html            |  802 +++++-----
 doc/graphyx/graphics/GraphicalBody$object.html     |   82 -
 doc/graphyx/graphics/GraphicalBody.html            |  814 +++++-----
 doc/graphyx/graphics/GraphicalCircle$object.html   |   82 -
 doc/graphyx/graphics/GraphicalCircle.html          | 1115 +++++++++-----
 .../graphics/GraphicalCollision$object.html        |   82 -
 doc/graphyx/graphics/GraphicalCollision.html       |  786 +++++-----
 .../graphics/GraphicalDistanceJoint$object.html    |   82 -
 doc/graphyx/graphics/GraphicalDistanceJoint.html   |  779 +++++-----
 doc/graphyx/graphics/GraphicalJoint.html           |  494 ++++--
 doc/graphyx/graphics/GraphicalObject.html          |  510 +++++--
 doc/graphyx/graphics/GraphicalPair$object.html     |   82 -
 doc/graphyx/graphics/GraphicalPair.html            |  786 +++++-----
 .../graphics/GraphicalRectangle$object.html        |   82 -
 doc/graphyx/graphics/GraphicalRectangle.html       | 1188 ++++++++++-----
 .../graphics/GraphicalRegularPolygon$object.html   |   82 -
 doc/graphyx/graphics/GraphicalRegularPolygon.html  | 1176 +++++++++-----
 .../graphics/GraphicalRevoluteJoint$object.html    |   82 -
 doc/graphyx/graphics/GraphicalRevoluteJoint.html   |  751 +++++----
 doc/graphyx/graphics/GraphicalShape.html           |  867 +++++++++--
 .../graphics/GraphicalSpringJoint$object.html      |   82 -
 doc/graphyx/graphics/GraphicalSpringJoint.html     |  779 +++++-----
 doc/graphyx/graphics/GraphicalWorld$object.html    |   82 -
 doc/graphyx/graphics/GraphicalWorld.html           |  712 ++++-----
 doc/graphyx/graphics/MonitorResult.html            |  183 +++
 doc/graphyx/graphics/Parser$.html                  |  204 +++
 doc/graphyx/graphics/Parser$object.html            |  221 ---
 doc/graphyx/graphics/Scene$object.html             |   82 -
 doc/graphyx/graphics/Scene.html                    |  704 ++++-----
 doc/graphyx/graphics/package.html                  |  201 +++
 doc/graphyx/gui$content.html                       |  188 ---
 doc/graphyx/gui$package.html                       |   30 -
 doc/graphyx/gui/AboutHelpFrame$.html               |  156 ++
 doc/graphyx/gui/AboutHelpFrame$object.html         |   98 --
 doc/graphyx/gui/AboutHelpFrame.html                |  834 ++++++++--
 doc/graphyx/gui/BodyPopup.html                     |  953 +++++++++---
 doc/graphyx/gui/Container.html                     |  364 ++---
 doc/graphyx/gui/ControlPanel.html                  | 1029 +++++++++----
 doc/graphyx/gui/GrabbedBody.html                   |  310 ++--
 doc/graphyx/gui/GravityPanel.html                  | 1018 +++++++++----
 doc/graphyx/gui/InfoPanel.html                     |  886 ++++++++---
 doc/graphyx/gui/MainFrame.html                     |  869 +++++++++--
 doc/graphyx/gui/MainPanel.html                     | 1099 +++++++++----
 doc/graphyx/gui/MenuHelp.html                      | 1274 +++++++++++++---
 doc/graphyx/gui/MenuPanel.html                     |  859 +++++++++--
 doc/graphyx/gui/OptionsPanel.html                  | 1607 ++++++++++++--------
 doc/graphyx/gui/PopupMenu.html                     |  873 ++++++++---
 doc/graphyx/gui/ShapeInfoPanel.html                | 1036 ++++++++++---
 doc/graphyx/gui/WorldPanel.html                    | 1592 ++++++++++---------
 doc/graphyx/gui/package.html                       |  185 +++
 doc/graphyx/package.html                           |   94 ++
 doc/graphyx/tests$content.html                     |  232 ---
 doc/graphyx/tests$package.html                     |   35 -
 doc/graphyx/tests/Atom$.html                       |  212 +++
 doc/graphyx/tests/Atom$object.html                 |  256 ----
 doc/graphyx/tests/BallStack$.html                  |  188 +++
 doc/graphyx/tests/BallStack$object.html            |  169 --
 doc/graphyx/tests/Cannon$.html                     |  196 +++
 doc/graphyx/tests/Carriage$$Car.html               |  231 +++
 doc/graphyx/tests/Carriage$.html                   |  199 +++
 doc/graphyx/tests/Carriage$object.Car.html         |  272 ----
 doc/graphyx/tests/Carriage$object.html             |  182 ---
 doc/graphyx/tests/Chain$.html                      |  188 +++
 doc/graphyx/tests/Chain$object.html                |  169 --
 doc/graphyx/tests/CompositeShape$.html             |  188 +++
 doc/graphyx/tests/CompositeShape$object.html       |  169 --
 doc/graphyx/tests/Cup$.html                        |  188 +++
 doc/graphyx/tests/Cup$object.html                  |  169 --
 doc/graphyx/tests/EmptyTest$.html                  |  188 +++
 doc/graphyx/tests/EmptyTest$object.html            |  169 --
 doc/graphyx/tests/Friction$.html                   |  212 +++
 doc/graphyx/tests/Friction$object.html             |  256 ----
 doc/graphyx/tests/Friction2$.html                  |  188 +++
 doc/graphyx/tests/Friction2$object.html            |  169 --
 doc/graphyx/tests/General1$.html                   |  196 +++
 doc/graphyx/tests/General1$object.html             |  216 ---
 doc/graphyx/tests/General2$.html                   |  188 +++
 doc/graphyx/tests/General2$object.html             |  169 --
 doc/graphyx/tests/Joints1$.html                    |  188 +++
 doc/graphyx/tests/Joints1$object.html              |  169 --
 doc/graphyx/tests/Joints2$.html                    |  188 +++
 doc/graphyx/tests/Joints2$object.html              |  169 --
 doc/graphyx/tests/Net$.html                        |  188 +++
 doc/graphyx/tests/Net$object.html                  |  169 --
 doc/graphyx/tests/RagdollTest$.html                |  188 +++
 doc/graphyx/tests/RagdollTest$object.html          |  169 --
 doc/graphyx/tests/Restitution$.html                |  188 +++
 doc/graphyx/tests/Restitution$object.html          |  169 --
 doc/graphyx/tests/Spring$.html                     |  188 +++
 doc/graphyx/tests/Spring$object.html               |  169 --
 doc/graphyx/tests/Stacking$.html                   |  188 +++
 doc/graphyx/tests/Stacking$object.html             |  169 --
 doc/graphyx/tests/Test.html                        |  358 +++--
 doc/graphyx/tests/Wave$.html                       |  188 +++
 doc/graphyx/tests/Wave$object.html                 |  169 --
 doc/graphyx/tests/package.html                     |  225 +++
 doc/index.html                                     |  404 ++++-
 doc/lib/class.png                                  |  Bin 0 -> 519 bytes
 doc/lib/class_big.png                              |  Bin 0 -> 2995 bytes
 doc/lib/index.css                                  |  102 ++
 doc/lib/index.js                                   |   81 +
 doc/lib/jquery.js                                  |   19 +
 doc/lib/object.png                                 |  Bin 0 -> 518 bytes
 doc/lib/object_big.png                             |  Bin 0 -> 3318 bytes
 doc/lib/package.png                                |  Bin 0 -> 488 bytes
 doc/lib/package_big.png                            |  Bin 0 -> 3183 bytes
 doc/lib/template.css                               |  259 ++++
 doc/lib/template.js                                |  100 ++
 doc/lib/trait.png                                  |  Bin 0 -> 504 bytes
 doc/lib/trait_big.png                              |  Bin 0 -> 2863 bytes
 doc/modules.html                                   |   36 -
 doc/nav-classes.html                               |   27 -
 doc/package.html                                   |   70 +
 doc/root-content.html                              |   74 -
 doc/script.js                                      |  112 --
 doc/sims/collision$content.html                    |  190 ---
 doc/sims/collision$package.html                    |   30 -
 doc/sims/collision/AABB$object.html                |   82 -
 doc/sims/collision/AABB.html                       |  534 +++----
 doc/sims/collision/CircleCollision$object.html     |   82 -
 doc/sims/collision/CircleCollision.html            |  706 ++++-----
 doc/sims/collision/Collision$.html                 |  162 ++
 doc/sims/collision/Collision$object.html           |  101 --
 doc/sims/collision/Collision.html                  |  500 +++---
 doc/sims/collision/Detector.html                   |  308 ++--
 doc/sims/collision/GridDetector.html               |  604 ++++----
 doc/sims/collision/Overlap$object.html             |   82 -
 doc/sims/collision/Overlap.html                    |  493 +++---
 doc/sims/collision/Pair$object.html                |   82 -
 doc/sims/collision/Pair.html                       |  513 ++++---
 doc/sims/collision/PolyCircleCollision$object.html |   82 -
 doc/sims/collision/PolyCircleCollision.html        |  706 ++++-----
 doc/sims/collision/PolyCollision$object.html       |   82 -
 doc/sims/collision/PolyCollision.html              |  798 ++++------
 doc/sims/collision/package.html                    |  137 ++
 doc/sims/dynamics$content.html                     |  146 --
 doc/sims/dynamics$package.html                     |   26 -
 doc/sims/dynamics/Body$.html                       |  148 ++
 doc/sims/dynamics/Body$object.html                 |   75 -
 doc/sims/dynamics/Body.html                        | 1134 ++++++--------
 doc/sims/dynamics/Circle$object.html               |   82 -
 doc/sims/dynamics/Circle.html                      |  960 ++++++------
 doc/sims/dynamics/Constraint.html                  |  296 ++--
 doc/sims/dynamics/Rectangle$object.html            |   82 -
 doc/sims/dynamics/Rectangle.html                   | 1004 +++++++-----
 doc/sims/dynamics/RegularPolygon$object.html       |   82 -
 doc/sims/dynamics/RegularPolygon.html              |  985 +++++++-----
 doc/sims/dynamics/Shape$.html                      |  148 ++
 doc/sims/dynamics/Shape$object.html                |   75 -
 doc/sims/dynamics/Shape.html                       |  999 ++++++------
 doc/sims/dynamics/World.html                       | 1222 +++++++--------
 doc/sims/dynamics/joints$content.html              |  103 --
 doc/sims/dynamics/joints$package.html              |   22 -
 doc/sims/dynamics/joints/DistanceJoint$object.html |   82 -
 doc/sims/dynamics/joints/DistanceJoint.html        |  830 +++++-----
 doc/sims/dynamics/joints/ForceJoint.html           |  255 ++--
 doc/sims/dynamics/joints/Joint.html                |  400 ++---
 doc/sims/dynamics/joints/RevoluteJoint$object.html |   82 -
 doc/sims/dynamics/joints/RevoluteJoint.html        |  712 ++++-----
 doc/sims/dynamics/joints/SpringJoint$object.html   |   82 -
 doc/sims/dynamics/joints/SpringJoint.html          |  983 +++++-------
 doc/sims/dynamics/joints/package.html              |  105 ++
 doc/sims/dynamics/joints/test$content.html         |   45 -
 doc/sims/dynamics/joints/test$package.html         |   17 -
 .../joints/test/PrismaticJoint$object.html         |   82 -
 doc/sims/dynamics/joints/test/PrismaticJoint.html  |  837 +++++-----
 doc/sims/dynamics/joints/test/UnitCircleJoint.html |  492 +++---
 doc/sims/dynamics/joints/test/package.html         |   70 +
 doc/sims/dynamics/package.html                     |  137 ++
 doc/sims/geometry$content.html                     |  111 --
 doc/sims/geometry$package.html                     |   23 -
 doc/sims/geometry/ConvexPolygon.html               |  412 ++---
 doc/sims/geometry/Projection$object.html           |   82 -
 doc/sims/geometry/Projection.html                  |  569 +++----
 doc/sims/geometry/Ray$object.html                  |   82 -
 doc/sims/geometry/Ray.html                         |  565 +++----
 doc/sims/geometry/Segment$object.html              |   82 -
 doc/sims/geometry/Segment.html                     |  743 ++++-----
 doc/sims/geometry/Vector2D$.html                   |  190 +++
 doc/sims/geometry/Vector2D$object.html             |  150 --
 doc/sims/geometry/Vector2D.html                    | 1047 ++++++-------
 doc/sims/geometry/package.html                     |  105 ++
 doc/sims/math$content.html                         |   34 -
 doc/sims/math$package.html                         |   16 -
 doc/sims/math/Matrix22$.html                       |  156 ++
 doc/sims/math/Matrix22$object.html                 |   98 --
 doc/sims/math/Matrix22.html                        |  764 ++++------
 doc/sims/math/package.html                         |   73 +
 doc/sims/package.html                              |  102 ++
 doc/sims/prefabs$content.html                      |   54 -
 doc/sims/prefabs$package.html                      |   17 -
 doc/sims/prefabs/Net.html                          |  439 +++---
 doc/sims/prefabs/Prefab.html                       |  265 ++--
 doc/sims/prefabs/Pylon.html                        |  487 +++---
 doc/sims/prefabs/Ragdoll.html                      |  719 ++++-----
 doc/sims/prefabs/package.html                      |   86 ++
 doc/sims/util$content.html                         |   56 -
 doc/sims/util$package.html                         |   18 -
 doc/sims/util/Polar$object.html                    |   82 -
 doc/sims/util/Polar.html                           |  525 +++----
 doc/sims/util/Positioning$.html                    |  196 +++
 doc/sims/util/Positioning$object.html              |  201 ---
 doc/sims/util/RelativeVector.html                  |  525 ++++---
 doc/sims/util/package.html                         |   81 +
 doc/style.css                                      |  148 --
 src/graphyx/Graphyx.scala                          |    7 +-
 src/graphyx/actors/GUIActor.scala                  |    3 +-
 src/graphyx/actors/PhysicsActor.scala              |    7 +-
 src/graphyx/graphics/Drawable.scala                |    2 +-
 src/graphyx/graphics/GraphicalRectangle.scala      |    2 +-
 src/graphyx/graphics/GraphicalRegularPolygon.scala |    3 +-
 src/graphyx/graphics/GraphicalWorld.scala          |   11 +-
 src/graphyx/gui/AboutHelpFrame.scala               |    6 +-
 src/graphyx/gui/Container.scala                    |    8 +-
 src/graphyx/gui/ControlPanel.scala                 |    4 +
 src/graphyx/gui/InfoPanel.scala                    |    2 +-
 src/graphyx/gui/MainFrame.scala                    |    1 +
 src/graphyx/gui/WorldPanel.scala                   |   15 +-
 src/graphyx/tests/Atom.scala                       |    1 +
 src/graphyx/tests/Cannon.scala                     |   59 +
 src/graphyx/tests/EmptyTest.scala                  |    1 +
 src/graphyx/tests/Friction.scala                   |    1 +
 src/graphyx/tests/Friction2.scala                  |    4 +-
 src/graphyx/tests/General1.scala                   |    1 +
 src/graphyx/tests/Spring.scala                     |   17 +-
 src/graphyx/tests/Test.scala                       |    1 +
 src/graphyx/tests/Wave.scala                       |   27 +-
 src/sims/collision/AABB.scala                      |    2 +-
 src/sims/collision/CircleCollision.scala           |    4 +-
 src/sims/collision/Collision.scala                 |    4 +-
 src/sims/collision/Detector.scala                  |    2 -
 src/sims/collision/GridDetector.scala              |    3 +-
 src/sims/collision/PolyCollision.scala             |    1 -
 src/sims/dynamics/World.scala                      |   15 +-
 src/sims/dynamics/joints/DistanceJoint.scala       |    1 +
 src/sims/dynamics/joints/SpringJoint.scala         |    1 +
 src/sims/dynamics/joints/test/PrismaticJoint.scala |    2 +
 .../dynamics/joints/test/UnitCircleJoint.scala     |    1 +
 262 files changed, 39669 insertions(+), 33250 deletions(-)
 delete mode 100644 doc/all-classes.html
 delete mode 100644 doc/graphyx$content.html
 delete mode 100644 doc/graphyx$package.html
 create mode 100644 doc/graphyx/Graphyx$.html
 delete mode 100644 doc/graphyx/Graphyx$object.html
 delete mode 100644 doc/graphyx/actors$content.html
 delete mode 100644 doc/graphyx/actors$package.html
 create mode 100644 doc/graphyx/actors/Exit$.html
 delete mode 100644 doc/graphyx/actors/Exit$object.html
 create mode 100644 doc/graphyx/actors/FireEvent$.html
 delete mode 100644 doc/graphyx/actors/FireEvent$object.html
 delete mode 100644 doc/graphyx/actors/SetWorld$object.html
 create mode 100644 doc/graphyx/actors/Start$.html
 delete mode 100644 doc/graphyx/actors/Start$object.html
 create mode 100644 doc/graphyx/actors/Stop$.html
 delete mode 100644 doc/graphyx/actors/Stop$object.html
 create mode 100644 doc/graphyx/actors/package.html
 delete mode 100644 doc/graphyx/graphics$content.html
 delete mode 100644 doc/graphyx/graphics$package.html
 delete mode 100644 doc/graphyx/graphics/GraphicalAABB$object.html
 delete mode 100644 doc/graphyx/graphics/GraphicalBody$object.html
 delete mode 100644 doc/graphyx/graphics/GraphicalCircle$object.html
 delete mode 100644 doc/graphyx/graphics/GraphicalCollision$object.html
 delete mode 100644 doc/graphyx/graphics/GraphicalDistanceJoint$object.html
 delete mode 100644 doc/graphyx/graphics/GraphicalPair$object.html
 delete mode 100644 doc/graphyx/graphics/GraphicalRectangle$object.html
 delete mode 100644 doc/graphyx/graphics/GraphicalRegularPolygon$object.html
 delete mode 100644 doc/graphyx/graphics/GraphicalRevoluteJoint$object.html
 delete mode 100644 doc/graphyx/graphics/GraphicalSpringJoint$object.html
 delete mode 100644 doc/graphyx/graphics/GraphicalWorld$object.html
 create mode 100644 doc/graphyx/graphics/MonitorResult.html
 create mode 100644 doc/graphyx/graphics/Parser$.html
 delete mode 100644 doc/graphyx/graphics/Parser$object.html
 delete mode 100644 doc/graphyx/graphics/Scene$object.html
 create mode 100644 doc/graphyx/graphics/package.html
 delete mode 100644 doc/graphyx/gui$content.html
 delete mode 100644 doc/graphyx/gui$package.html
 create mode 100644 doc/graphyx/gui/AboutHelpFrame$.html
 delete mode 100644 doc/graphyx/gui/AboutHelpFrame$object.html
 create mode 100644 doc/graphyx/gui/package.html
 create mode 100644 doc/graphyx/package.html
 delete mode 100644 doc/graphyx/tests$content.html
 delete mode 100644 doc/graphyx/tests$package.html
 create mode 100644 doc/graphyx/tests/Atom$.html
 delete mode 100644 doc/graphyx/tests/Atom$object.html
 create mode 100644 doc/graphyx/tests/BallStack$.html
 delete mode 100644 doc/graphyx/tests/BallStack$object.html
 create mode 100644 doc/graphyx/tests/Cannon$.html
 create mode 100644 doc/graphyx/tests/Carriage$$Car.html
 create mode 100644 doc/graphyx/tests/Carriage$.html
 delete mode 100644 doc/graphyx/tests/Carriage$object.Car.html
 delete mode 100644 doc/graphyx/tests/Carriage$object.html
 create mode 100644 doc/graphyx/tests/Chain$.html
 delete mode 100644 doc/graphyx/tests/Chain$object.html
 create mode 100644 doc/graphyx/tests/CompositeShape$.html
 delete mode 100644 doc/graphyx/tests/CompositeShape$object.html
 create mode 100644 doc/graphyx/tests/Cup$.html
 delete mode 100644 doc/graphyx/tests/Cup$object.html
 create mode 100644 doc/graphyx/tests/EmptyTest$.html
 delete mode 100644 doc/graphyx/tests/EmptyTest$object.html
 create mode 100644 doc/graphyx/tests/Friction$.html
 delete mode 100644 doc/graphyx/tests/Friction$object.html
 create mode 100644 doc/graphyx/tests/Friction2$.html
 delete mode 100644 doc/graphyx/tests/Friction2$object.html
 create mode 100644 doc/graphyx/tests/General1$.html
 delete mode 100644 doc/graphyx/tests/General1$object.html
 create mode 100644 doc/graphyx/tests/General2$.html
 delete mode 100644 doc/graphyx/tests/General2$object.html
 create mode 100644 doc/graphyx/tests/Joints1$.html
 delete mode 100644 doc/graphyx/tests/Joints1$object.html
 create mode 100644 doc/graphyx/tests/Joints2$.html
 delete mode 100644 doc/graphyx/tests/Joints2$object.html
 create mode 100644 doc/graphyx/tests/Net$.html
 delete mode 100644 doc/graphyx/tests/Net$object.html
 create mode 100644 doc/graphyx/tests/RagdollTest$.html
 delete mode 100644 doc/graphyx/tests/RagdollTest$object.html
 create mode 100644 doc/graphyx/tests/Restitution$.html
 delete mode 100644 doc/graphyx/tests/Restitution$object.html
 create mode 100644 doc/graphyx/tests/Spring$.html
 delete mode 100644 doc/graphyx/tests/Spring$object.html
 create mode 100644 doc/graphyx/tests/Stacking$.html
 delete mode 100644 doc/graphyx/tests/Stacking$object.html
 create mode 100644 doc/graphyx/tests/Wave$.html
 delete mode 100644 doc/graphyx/tests/Wave$object.html
 create mode 100644 doc/graphyx/tests/package.html
 create mode 100644 doc/lib/class.png
 create mode 100644 doc/lib/class_big.png
 create mode 100644 doc/lib/index.css
 create mode 100644 doc/lib/index.js
 create mode 100644 doc/lib/jquery.js
 create mode 100644 doc/lib/object.png
 create mode 100644 doc/lib/object_big.png
 create mode 100644 doc/lib/package.png
 create mode 100644 doc/lib/package_big.png
 create mode 100644 doc/lib/template.css
 create mode 100644 doc/lib/template.js
 create mode 100644 doc/lib/trait.png
 create mode 100644 doc/lib/trait_big.png
 delete mode 100644 doc/modules.html
 delete mode 100644 doc/nav-classes.html
 create mode 100644 doc/package.html
 delete mode 100644 doc/root-content.html
 delete mode 100644 doc/script.js
 delete mode 100644 doc/sims/collision$content.html
 delete mode 100644 doc/sims/collision$package.html
 delete mode 100644 doc/sims/collision/AABB$object.html
 delete mode 100644 doc/sims/collision/CircleCollision$object.html
 create mode 100644 doc/sims/collision/Collision$.html
 delete mode 100644 doc/sims/collision/Collision$object.html
 delete mode 100644 doc/sims/collision/Overlap$object.html
 delete mode 100644 doc/sims/collision/Pair$object.html
 delete mode 100644 doc/sims/collision/PolyCircleCollision$object.html
 delete mode 100644 doc/sims/collision/PolyCollision$object.html
 create mode 100644 doc/sims/collision/package.html
 delete mode 100644 doc/sims/dynamics$content.html
 delete mode 100644 doc/sims/dynamics$package.html
 create mode 100644 doc/sims/dynamics/Body$.html
 delete mode 100644 doc/sims/dynamics/Body$object.html
 delete mode 100644 doc/sims/dynamics/Circle$object.html
 delete mode 100644 doc/sims/dynamics/Rectangle$object.html
 delete mode 100644 doc/sims/dynamics/RegularPolygon$object.html
 create mode 100644 doc/sims/dynamics/Shape$.html
 delete mode 100644 doc/sims/dynamics/Shape$object.html
 delete mode 100644 doc/sims/dynamics/joints$content.html
 delete mode 100644 doc/sims/dynamics/joints$package.html
 delete mode 100644 doc/sims/dynamics/joints/DistanceJoint$object.html
 delete mode 100644 doc/sims/dynamics/joints/RevoluteJoint$object.html
 delete mode 100644 doc/sims/dynamics/joints/SpringJoint$object.html
 create mode 100644 doc/sims/dynamics/joints/package.html
 delete mode 100644 doc/sims/dynamics/joints/test$content.html
 delete mode 100644 doc/sims/dynamics/joints/test$package.html
 delete mode 100644 doc/sims/dynamics/joints/test/PrismaticJoint$object.html
 create mode 100644 doc/sims/dynamics/joints/test/package.html
 create mode 100644 doc/sims/dynamics/package.html
 delete mode 100644 doc/sims/geometry$content.html
 delete mode 100644 doc/sims/geometry$package.html
 delete mode 100644 doc/sims/geometry/Projection$object.html
 delete mode 100644 doc/sims/geometry/Ray$object.html
 delete mode 100644 doc/sims/geometry/Segment$object.html
 create mode 100644 doc/sims/geometry/Vector2D$.html
 delete mode 100644 doc/sims/geometry/Vector2D$object.html
 create mode 100644 doc/sims/geometry/package.html
 delete mode 100644 doc/sims/math$content.html
 delete mode 100644 doc/sims/math$package.html
 create mode 100644 doc/sims/math/Matrix22$.html
 delete mode 100644 doc/sims/math/Matrix22$object.html
 create mode 100644 doc/sims/math/package.html
 create mode 100644 doc/sims/package.html
 delete mode 100644 doc/sims/prefabs$content.html
 delete mode 100644 doc/sims/prefabs$package.html
 create mode 100644 doc/sims/prefabs/package.html
 delete mode 100644 doc/sims/util$content.html
 delete mode 100644 doc/sims/util$package.html
 delete mode 100644 doc/sims/util/Polar$object.html
 create mode 100644 doc/sims/util/Positioning$.html
 delete mode 100644 doc/sims/util/Positioning$object.html
 create mode 100644 doc/sims/util/package.html
 delete mode 100644 doc/style.css
 create mode 100644 src/graphyx/tests/Cannon.scala

diff --git a/doc/all-classes.html b/doc/all-classes.html
deleted file mode 100644
index c31b553..0000000
--- a/doc/all-classes.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>List of all classes and objects</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script>
-        </head>
-        <body onload="init()"><div><div class="kinds" id="Classes">Classes</div><ul class="list">
-        <li id="Classes_A"><a href="sims/collision/AABB.html" target="contentFrame">AABB</a></li>
-<li><a href="graphyx/gui/AboutHelpFrame.html" target="contentFrame">AboutHelpFrame</a></li>
-<li id="Classes_B"><a href="sims/dynamics/Body.html" target="contentFrame">Body</a></li>
-<li><a href="graphyx/gui/BodyPopup.html" target="contentFrame">BodyPopup</a></li>
-<li id="Classes_C"><a href="graphyx/tests/Carriage$object.Car.html" target="contentFrame">Carriage.Car</a></li>
-<li><a href="sims/dynamics/Circle.html" target="contentFrame">Circle</a></li>
-<li><a href="sims/collision/CircleCollision.html" target="contentFrame">CircleCollision</a></li>
-<li><a href="sims/collision/Collision.html" target="contentFrame">Collision</a></li>
-<li><a href="sims/dynamics/Constraint.html" target="contentFrame">Constraint</a></li>
-<li><a href="graphyx/gui/Container.html" target="contentFrame">Container</a></li>
-<li><a href="graphyx/gui/ControlPanel.html" target="contentFrame">ControlPanel</a></li>
-<li><a href="sims/geometry/ConvexPolygon.html" target="contentFrame">ConvexPolygon</a></li>
-<li id="Classes_D"><a href="sims/collision/Detector.html" target="contentFrame">Detector</a></li>
-<li><a href="sims/dynamics/joints/DistanceJoint.html" target="contentFrame">DistanceJoint</a></li>
-<li><a href="graphyx/graphics/Drawable.html" target="contentFrame">Drawable</a></li>
-<li id="Classes_F"><a href="sims/dynamics/joints/ForceJoint.html" target="contentFrame">ForceJoint</a></li>
-<li id="Classes_G"><a href="graphyx/actors/GUIActor.html" target="contentFrame">GUIActor</a></li>
-<li><a href="graphyx/gui/GrabbedBody.html" target="contentFrame">GrabbedBody</a></li>
-<li><a href="graphyx/graphics/GraphicalAABB.html" target="contentFrame">GraphicalAABB</a></li>
-<li><a href="graphyx/graphics/GraphicalBody.html" target="contentFrame">GraphicalBody</a></li>
-<li><a href="graphyx/graphics/GraphicalCircle.html" target="contentFrame">GraphicalCircle</a></li>
-<li><a href="graphyx/graphics/GraphicalCollision.html" target="contentFrame">GraphicalCollision</a></li>
-<li><a href="graphyx/graphics/GraphicalDistanceJoint.html" target="contentFrame">GraphicalDistanceJoint</a></li>
-<li><a href="graphyx/graphics/GraphicalJoint.html" target="contentFrame">GraphicalJoint</a></li>
-<li><a href="graphyx/graphics/GraphicalObject.html" target="contentFrame">GraphicalObject</a></li>
-<li><a href="graphyx/graphics/GraphicalPair.html" target="contentFrame">GraphicalPair</a></li>
-<li><a href="graphyx/graphics/GraphicalRectangle.html" target="contentFrame">GraphicalRectangle</a></li>
-<li><a href="graphyx/graphics/GraphicalRegularPolygon.html" target="contentFrame">GraphicalRegularPolygon</a></li>
-<li><a href="graphyx/graphics/GraphicalRevoluteJoint.html" target="contentFrame">GraphicalRevoluteJoint</a></li>
-<li><a href="graphyx/graphics/GraphicalShape.html" target="contentFrame">GraphicalShape</a></li>
-<li><a href="graphyx/graphics/GraphicalSpringJoint.html" target="contentFrame">GraphicalSpringJoint</a></li>
-<li><a href="graphyx/graphics/GraphicalWorld.html" target="contentFrame">GraphicalWorld</a></li>
-<li><a href="graphyx/gui/GravityPanel.html" target="contentFrame">GravityPanel</a></li>
-<li><a href="sims/collision/GridDetector.html" target="contentFrame">GridDetector</a></li>
-<li id="Classes_I"><a href="graphyx/gui/InfoPanel.html" target="contentFrame">InfoPanel</a></li>
-<li id="Classes_J"><a href="sims/dynamics/joints/Joint.html" target="contentFrame">Joint</a></li>
-<li id="Classes_M"><a href="graphyx/gui/MainFrame.html" target="contentFrame">MainFrame</a></li>
-<li><a href="graphyx/gui/MainPanel.html" target="contentFrame">MainPanel</a></li>
-<li><a href="sims/math/Matrix22.html" target="contentFrame">Matrix22</a></li>
-<li><a href="graphyx/gui/MenuHelp.html" target="contentFrame">MenuHelp</a></li>
-<li><a href="graphyx/gui/MenuPanel.html" target="contentFrame">MenuPanel</a></li>
-<li id="Classes_N"><a href="sims/prefabs/Net.html" target="contentFrame">Net</a></li>
-<li id="Classes_O"><a href="graphyx/gui/OptionsPanel.html" target="contentFrame">OptionsPanel</a></li>
-<li><a href="sims/collision/Overlap.html" target="contentFrame">Overlap</a></li>
-<li id="Classes_P"><a href="sims/collision/Pair.html" target="contentFrame">Pair</a></li>
-<li><a href="graphyx/actors/PhysicsActor.html" target="contentFrame">PhysicsActor</a></li>
-<li><a href="sims/util/Polar.html" target="contentFrame">Polar</a></li>
-<li><a href="sims/collision/PolyCircleCollision.html" target="contentFrame">PolyCircleCollision</a></li>
-<li><a href="sims/collision/PolyCollision.html" target="contentFrame">PolyCollision</a></li>
-<li><a href="graphyx/gui/PopupMenu.html" target="contentFrame">PopupMenu</a></li>
-<li><a href="sims/prefabs/Prefab.html" target="contentFrame">Prefab</a></li>
-<li><a href="sims/dynamics/joints/test/PrismaticJoint.html" target="contentFrame">PrismaticJoint</a></li>
-<li><a href="sims/geometry/Projection.html" target="contentFrame">Projection</a></li>
-<li><a href="sims/prefabs/Pylon.html" target="contentFrame">Pylon</a></li>
-<li id="Classes_R"><a href="sims/prefabs/Ragdoll.html" target="contentFrame">Ragdoll</a></li>
-<li><a href="sims/geometry/Ray.html" target="contentFrame">Ray</a></li>
-<li><a href="sims/dynamics/Rectangle.html" target="contentFrame">Rectangle</a></li>
-<li><a href="sims/dynamics/RegularPolygon.html" target="contentFrame">RegularPolygon</a></li>
-<li><a href="sims/util/RelativeVector.html" target="contentFrame">RelativeVector</a></li>
-<li><a href="sims/dynamics/joints/RevoluteJoint.html" target="contentFrame">RevoluteJoint</a></li>
-<li id="Classes_S"><a href="graphyx/graphics/Scene.html" target="contentFrame">Scene</a></li>
-<li><a href="sims/geometry/Segment.html" target="contentFrame">Segment</a></li>
-<li><a href="graphyx/actors/SetWorld.html" target="contentFrame">SetWorld</a></li>
-<li><a href="sims/dynamics/Shape.html" target="contentFrame">Shape</a></li>
-<li><a href="graphyx/gui/ShapeInfoPanel.html" target="contentFrame">ShapeInfoPanel</a></li>
-<li><a href="sims/dynamics/joints/SpringJoint.html" target="contentFrame">SpringJoint</a></li>
-<li id="Classes_T"><a href="graphyx/tests/Test.html" target="contentFrame">Test</a></li>
-<li id="Classes_U"><a href="sims/dynamics/joints/test/UnitCircleJoint.html" target="contentFrame">UnitCircleJoint</a></li>
-<li id="Classes_V"><a href="sims/geometry/Vector2D.html" target="contentFrame">Vector2D</a></li>
-<li id="Classes_W"><a href="sims/dynamics/World.html" target="contentFrame">World</a></li>
-<li><a href="graphyx/gui/WorldPanel.html" target="contentFrame">WorldPanel</a></li>
-        </ul>
-<div class="kinds" id="Objects">Objects</div><ul class="list">
-        <li id="Objects_A"><a href="sims/collision/AABB$object.html" target="contentFrame">AABB</a></li>
-<li><a href="graphyx/gui/AboutHelpFrame$object.html" target="contentFrame">AboutHelpFrame</a></li>
-<li><a href="graphyx/tests/Atom$object.html" target="contentFrame">Atom</a></li>
-<li id="Objects_B"><a href="graphyx/tests/BallStack$object.html" target="contentFrame">BallStack</a></li>
-<li><a href="sims/dynamics/Body$object.html" target="contentFrame">Body</a></li>
-<li id="Objects_C"><a href="graphyx/tests/Carriage$object.html" target="contentFrame">Carriage</a></li>
-<li><a href="graphyx/tests/Chain$object.html" target="contentFrame">Chain</a></li>
-<li><a href="sims/dynamics/Circle$object.html" target="contentFrame">Circle</a></li>
-<li><a href="sims/collision/CircleCollision$object.html" target="contentFrame">CircleCollision</a></li>
-<li><a href="sims/collision/Collision$object.html" target="contentFrame">Collision</a></li>
-<li><a href="graphyx/tests/CompositeShape$object.html" target="contentFrame">CompositeShape</a></li>
-<li><a href="graphyx/tests/Cup$object.html" target="contentFrame">Cup</a></li>
-<li id="Objects_D"><a href="sims/dynamics/joints/DistanceJoint$object.html" target="contentFrame">DistanceJoint</a></li>
-<li id="Objects_E"><a href="graphyx/tests/EmptyTest$object.html" target="contentFrame">EmptyTest</a></li>
-<li><a href="graphyx/actors/Exit$object.html" target="contentFrame">Exit</a></li>
-<li id="Objects_F"><a href="graphyx/actors/FireEvent$object.html" target="contentFrame">FireEvent</a></li>
-<li><a href="graphyx/tests/Friction$object.html" target="contentFrame">Friction</a></li>
-<li><a href="graphyx/tests/Friction2$object.html" target="contentFrame">Friction2</a></li>
-<li id="Objects_G"><a href="graphyx/tests/General1$object.html" target="contentFrame">General1</a></li>
-<li><a href="graphyx/tests/General2$object.html" target="contentFrame">General2</a></li>
-<li><a href="graphyx/graphics/GraphicalAABB$object.html" target="contentFrame">GraphicalAABB</a></li>
-<li><a href="graphyx/graphics/GraphicalBody$object.html" target="contentFrame">GraphicalBody</a></li>
-<li><a href="graphyx/graphics/GraphicalCircle$object.html" target="contentFrame">GraphicalCircle</a></li>
-<li><a href="graphyx/graphics/GraphicalCollision$object.html" target="contentFrame">GraphicalCollision</a></li>
-<li><a href="graphyx/graphics/GraphicalDistanceJoint$object.html" target="contentFrame">GraphicalDistanceJoint</a></li>
-<li><a href="graphyx/graphics/GraphicalPair$object.html" target="contentFrame">GraphicalPair</a></li>
-<li><a href="graphyx/graphics/GraphicalRectangle$object.html" target="contentFrame">GraphicalRectangle</a></li>
-<li><a href="graphyx/graphics/GraphicalRegularPolygon$object.html" target="contentFrame">GraphicalRegularPolygon</a></li>
-<li><a href="graphyx/graphics/GraphicalRevoluteJoint$object.html" target="contentFrame">GraphicalRevoluteJoint</a></li>
-<li><a href="graphyx/graphics/GraphicalSpringJoint$object.html" target="contentFrame">GraphicalSpringJoint</a></li>
-<li><a href="graphyx/graphics/GraphicalWorld$object.html" target="contentFrame">GraphicalWorld</a></li>
-<li><a href="graphyx/Graphyx$object.html" target="contentFrame">Graphyx</a></li>
-<li id="Objects_J"><a href="graphyx/tests/Joints1$object.html" target="contentFrame">Joints1</a></li>
-<li><a href="graphyx/tests/Joints2$object.html" target="contentFrame">Joints2</a></li>
-<li id="Objects_M"><a href="sims/math/Matrix22$object.html" target="contentFrame">Matrix22</a></li>
-<li id="Objects_N"><a href="graphyx/tests/Net$object.html" target="contentFrame">Net</a></li>
-<li id="Objects_O"><a href="sims/collision/Overlap$object.html" target="contentFrame">Overlap</a></li>
-<li id="Objects_P"><a href="sims/collision/Pair$object.html" target="contentFrame">Pair</a></li>
-<li><a href="graphyx/graphics/Parser$object.html" target="contentFrame">Parser</a></li>
-<li><a href="sims/util/Polar$object.html" target="contentFrame">Polar</a></li>
-<li><a href="sims/collision/PolyCircleCollision$object.html" target="contentFrame">PolyCircleCollision</a></li>
-<li><a href="sims/collision/PolyCollision$object.html" target="contentFrame">PolyCollision</a></li>
-<li><a href="sims/util/Positioning$object.html" target="contentFrame">Positioning</a></li>
-<li><a href="sims/dynamics/joints/test/PrismaticJoint$object.html" target="contentFrame">PrismaticJoint</a></li>
-<li><a href="sims/geometry/Projection$object.html" target="contentFrame">Projection</a></li>
-<li id="Objects_R"><a href="graphyx/tests/RagdollTest$object.html" target="contentFrame">RagdollTest</a></li>
-<li><a href="sims/geometry/Ray$object.html" target="contentFrame">Ray</a></li>
-<li><a href="sims/dynamics/Rectangle$object.html" target="contentFrame">Rectangle</a></li>
-<li><a href="sims/dynamics/RegularPolygon$object.html" target="contentFrame">RegularPolygon</a></li>
-<li><a href="graphyx/tests/Restitution$object.html" target="contentFrame">Restitution</a></li>
-<li><a href="sims/dynamics/joints/RevoluteJoint$object.html" target="contentFrame">RevoluteJoint</a></li>
-<li id="Objects_S"><a href="graphyx/graphics/Scene$object.html" target="contentFrame">Scene</a></li>
-<li><a href="sims/geometry/Segment$object.html" target="contentFrame">Segment</a></li>
-<li><a href="graphyx/actors/SetWorld$object.html" target="contentFrame">SetWorld</a></li>
-<li><a href="sims/dynamics/Shape$object.html" target="contentFrame">Shape</a></li>
-<li><a href="graphyx/tests/Spring$object.html" target="contentFrame">Spring</a></li>
-<li><a href="sims/dynamics/joints/SpringJoint$object.html" target="contentFrame">SpringJoint</a></li>
-<li><a href="graphyx/tests/Stacking$object.html" target="contentFrame">Stacking</a></li>
-<li><a href="graphyx/actors/Start$object.html" target="contentFrame">Start</a></li>
-<li><a href="graphyx/actors/Stop$object.html" target="contentFrame">Stop</a></li>
-<li id="Objects_V"><a href="sims/geometry/Vector2D$object.html" target="contentFrame">Vector2D</a></li>
-<li id="Objects_W"><a href="graphyx/tests/Wave$object.html" target="contentFrame">Wave</a></li>
-        </ul></div></body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx$content.html b/doc/graphyx$content.html
deleted file mode 100644
index b78a5ec..0000000
--- a/doc/graphyx$content.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>All classes and objects in graphyx</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script>
-        </head>
-        <body onload="init()"><div class="page-title"><div>Simple Mechanics Simulator (SiMS) API</div></div><p><div>This document is the API specification for SiMS</div></p>
-<table summary="" cellpadding="3" class="member">
-        <tr><td class="title" colspan="2">Object Summary</td></tr>
-        <tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="graphyx/Graphyx$object.html" target="_self">Graphyx</a></em>
-        <code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        
-      </td>
-    </tr>        
-        </table></body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx$package.html b/doc/graphyx$package.html
deleted file mode 100644
index ce0ccc2..0000000
--- a/doc/graphyx$package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>List of classes and objects in package graphyx</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script>
-        </head>
-        <body onload="init()"><table summary="" class="navigation">
-          <tr><td class="navigation-links" valign="top">
-            <a href="graphyx$content.html" target="contentFrame">graphyx</a>
-          </td></tr>
-        </table><div>
-<div class="kinds" id="Objects">Objects</div><ul class="list">
-        <li id="Objects_G"><a href="graphyx/Graphyx$object.html" target="contentFrame">Graphyx</a></li>
-        </ul></div></body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/Graphyx$.html b/doc/graphyx/Graphyx$.html
new file mode 100644
index 0000000..eaf48a5
--- /dev/null
+++ b/doc/graphyx/Graphyx$.html
@@ -0,0 +1,204 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.Graphyx</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="package.html">graphyx</a></p>
+
+      <div id="definition">
+        <img src="../lib/object_big.png" />
+        <h1>Graphyx</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Graphyx</span><span class="result"> extends AnyRef</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.Graphyx#exit">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">exit</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.Graphyx#guiActor">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">guiActor</span><span class="result">: <a href="actors/GUIActor.html" class="extype" name="graphyx.actors.GUIActor">GUIActor</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.Graphyx#main">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">main</span><span class="params">(<span name="args">args: <span class="extype" name="scala.Array">Array</span>[<span class="extype" name="java.lang.String">String</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.Graphyx#physicsActor">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">physicsActor</span><span class="result">: <a href="actors/PhysicsActor.html" class="extype" name="graphyx.actors.PhysicsActor">PhysicsActor</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.Graphyx#test">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">test</span><span class="result">: <a href="tests/Test.html" class="extype" name="graphyx.tests.Test">Test</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.Graphyx#test_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">test_=</span><span class="params">(<span name="t">t: <a href="tests/Test.html" class="extype" name="graphyx.tests.Test">Test</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.Graphyx#tests">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">tests</span><span class="result">: <span class="extype" name="scala.collection.immutable.List">List</span>[<a href="tests/Test.html" class="extype" name="graphyx.tests.Test">Test</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/Graphyx$object.html b/doc/graphyx/Graphyx$object.html
deleted file mode 100644
index 1e705a8..0000000
--- a/doc/graphyx/Graphyx$object.html
+++ /dev/null
@@ -1,221 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Graphyx in graphyx</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../graphyx$package.html" target="_self">graphyx</a>
-        <br></br>
-        <span class="entity">object  Graphyx</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/Graphyx"><code>graphyx/Graphyx.scala</code></a>]
-      </div><hr></hr>
-      <a name="Graphyx"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Graphyx</em>
-      </dt>
-      <dd><code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a></dd>
-    </dl>
-      
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/Graphyx$object.html#guiActor" target="_self">guiActor</a></em>
-         : <a href="../graphyx/actors/GUIActor.html" target="_self">GUIActor</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/Graphyx$object.html#physicsActor" target="_self">physicsActor</a></em>
-         : <a href="../graphyx/actors/PhysicsActor.html" target="_self">PhysicsActor</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/Graphyx$object.html#tests" target="_self">tests</a></em>
-         : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../graphyx/tests/Test.html" target="_self">Test</a>]
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/Graphyx$object.html#exit%28%29" target="_self">exit</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/Graphyx$object.html#main%28Array%5BString%5D%29" target="_self">main</a></em>
-        (<em>args</em> : <a href="" target="contentFrame" class="scala/Array">scala.Array</a>[<a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>]) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/Graphyx$object.html#test" target="_self">test</a></em>
-         : <a href="../graphyx/tests/Test.html" target="_self">Test</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/Graphyx$object.html#test_%3D%28graphyx.tests.Test%29" target="_self">test_=</a></em>
-        (<em>t</em> : <a href="../graphyx/tests/Test.html" target="_self">Test</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="tests"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>tests</em> : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../graphyx/tests/Test.html" target="_self">Test</a>]
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="physicsActor"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>physicsActor</em> : <a href="../graphyx/actors/PhysicsActor.html" target="_self">PhysicsActor</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="guiActor"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>guiActor</em> : <a href="../graphyx/actors/GUIActor.html" target="_self">GUIActor</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="test"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>test</em> : <a href="../graphyx/tests/Test.html" target="_self">Test</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="test_%3D%28graphyx.tests.Test%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>test_=</em>(<em>t</em> : <a href="../graphyx/tests/Test.html" target="_self">Test</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="main%28Array%5BString%5D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>main</em>(<em>args</em> : <a href="" target="contentFrame" class="scala/Array">scala.Array</a>[<a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>]) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="exit%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>exit</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/actors$content.html b/doc/graphyx/actors$content.html
deleted file mode 100644
index 03856e4..0000000
--- a/doc/graphyx/actors$content.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>All classes and objects in graphyx.actors</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../script.js"></script>
-        </head>
-        <body onload="init()"><div class="page-title"><div>Simple Mechanics Simulator (SiMS) API</div></div><p><div>This document is the API specification for SiMS</div></p><table summary="" cellpadding="3" class="member">
-        <tr><td class="title" colspan="2">Class Summary</td></tr>
-        <tr>
-      <td class="modifiers" valign="top"> 
-        <code> class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/actors/GUIActor.html" target="_self">GUIActor</a></em>
-        <code> extends </code><a href="" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/actors/PhysicsActor.html" target="_self">PhysicsActor</a></em>
-        <code> extends </code><a href="" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/actors/SetWorld.html" target="_self">SetWorld</a></em>
-        (<code>val </code><em>world</em> : <a href="../sims/dynamics/World.html" target="_self">World</a>)<code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        
-      </td>
-    </tr>        
-        </table>
-<table summary="" cellpadding="3" class="member">
-        <tr><td class="title" colspan="2">Object Summary</td></tr>
-        <tr>
-      <td class="modifiers" valign="top"> 
-        <code>case object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/actors/Exit$object.html" target="_self">Exit</a></em>
-        <code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/actors/FireEvent$object.html" target="_self">FireEvent</a></em>
-        <code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/actors/SetWorld$object.html" target="_self">SetWorld</a></em>
-        <code> extends </code>(<a href="../sims/dynamics/World.html" target="_self">World</a>) =&gt; <a href="../graphyx/actors/SetWorld.html" target="_self">SetWorld</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/actors/Start$object.html" target="_self">Start</a></em>
-        <code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/actors/Stop$object.html" target="_self">Stop</a></em>
-        <code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        
-      </td>
-    </tr>        
-        </table></body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/actors$package.html b/doc/graphyx/actors$package.html
deleted file mode 100644
index c79a9d8..0000000
--- a/doc/graphyx/actors$package.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>List of classes and objects in package graphyx.actors</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../script.js"></script>
-        </head>
-        <body onload="init()"><table summary="" class="navigation">
-          <tr><td class="navigation-links" valign="top">
-            <a href="../graphyx/actors$content.html" target="contentFrame">graphyx.actors</a>
-          </td></tr>
-        </table><div><div class="kinds" id="Classes">Classes</div><ul class="list">
-        <li id="Classes_G"><a href="../graphyx/actors/GUIActor.html" target="contentFrame">GUIActor</a></li>
-<li id="Classes_P"><a href="../graphyx/actors/PhysicsActor.html" target="contentFrame">PhysicsActor</a></li>
-<li id="Classes_S"><a href="../graphyx/actors/SetWorld.html" target="contentFrame">SetWorld</a></li>
-        </ul>
-<div class="kinds" id="Objects">Objects</div><ul class="list">
-        <li id="Objects_E"><a href="../graphyx/actors/Exit$object.html" target="contentFrame">Exit</a></li>
-<li id="Objects_F"><a href="../graphyx/actors/FireEvent$object.html" target="contentFrame">FireEvent</a></li>
-<li id="Objects_S"><a href="../graphyx/actors/SetWorld$object.html" target="contentFrame">SetWorld</a></li>
-<li><a href="../graphyx/actors/Start$object.html" target="contentFrame">Start</a></li>
-<li><a href="../graphyx/actors/Stop$object.html" target="contentFrame">Stop</a></li>
-        </ul></div></body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/actors/Exit$.html b/doc/graphyx/actors/Exit$.html
new file mode 100644
index 0000000..5d58d93
--- /dev/null
+++ b/doc/graphyx/actors/Exit$.html
@@ -0,0 +1,177 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.actors.Exit</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">actors</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>Exit</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Exit</span><span class="result"> extends <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.actors.Exit#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.actors.Exit#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.actors.Exit#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.actors.Exit#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/actors/Exit$object.html b/doc/graphyx/actors/Exit$object.html
deleted file mode 100644
index ad24c13..0000000
--- a/doc/graphyx/actors/Exit$object.html
+++ /dev/null
@@ -1,205 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Exit in graphyx.actors</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/actors$package.html" target="_self">graphyx.actors</a>
-        <br></br>
-        <span class="entity">object  Exit</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/actors/Exit"><code>graphyx/actors/Exit.scala</code></a>]
-      </div><hr></hr>
-      <a name="Exit"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>object</code>
-        <em>Exit</em>
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/Exit$object.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/Exit$object.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/Exit$object.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>protected def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/Exit$object.html#readResolve%28%29" target="_self">readResolve</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override final def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/Exit$object.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="toString%28%29"></a><dl>
-      <dt>
-        
-        <code>override final</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr>
-<a name="readResolve%28%29"></a><dl>
-      <dt>
-        
-        <code>protected</code>
-        <code>def</code>
-        <em>readResolve</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/actors/FireEvent$.html b/doc/graphyx/actors/FireEvent$.html
new file mode 100644
index 0000000..a882711
--- /dev/null
+++ b/doc/graphyx/actors/FireEvent$.html
@@ -0,0 +1,177 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.actors.FireEvent</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">actors</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>FireEvent</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">FireEvent</span><span class="result"> extends <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.actors.FireEvent#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.actors.FireEvent#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.actors.FireEvent#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.actors.FireEvent#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/actors/FireEvent$object.html b/doc/graphyx/actors/FireEvent$object.html
deleted file mode 100644
index 978fd70..0000000
--- a/doc/graphyx/actors/FireEvent$object.html
+++ /dev/null
@@ -1,205 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object FireEvent in graphyx.actors</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/actors$package.html" target="_self">graphyx.actors</a>
-        <br></br>
-        <span class="entity">object  FireEvent</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/actors/FireEvent"><code>graphyx/actors/FireEvent.scala</code></a>]
-      </div><hr></hr>
-      <a name="FireEvent"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>object</code>
-        <em>FireEvent</em>
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/FireEvent$object.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/FireEvent$object.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/FireEvent$object.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>protected def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/FireEvent$object.html#readResolve%28%29" target="_self">readResolve</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override final def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/FireEvent$object.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="toString%28%29"></a><dl>
-      <dt>
-        
-        <code>override final</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr>
-<a name="readResolve%28%29"></a><dl>
-      <dt>
-        
-        <code>protected</code>
-        <code>def</code>
-        <em>readResolve</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/actors/GUIActor.html b/doc/graphyx/actors/GUIActor.html
index 2dbb266..f6a8d4c 100644
--- a/doc/graphyx/actors/GUIActor.html
+++ b/doc/graphyx/actors/GUIActor.html
@@ -1,162 +1,327 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class GUIActor in graphyx.actors</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.actors.GUIActor</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/actors$package.html" target="_self">graphyx.actors</a>
-        <br></br>
-        <span class="entity">class  GUIActor</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/actors/GUIActor"><code>graphyx/actors/GUIActor.scala</code></a>]
-      </div><hr></hr>
-      <a name="GUIActor"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>class</code>
-        <em>GUIActor</em>
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">actors</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/GUIActor.html#container" target="_self">container</a></em>
-         : <a href="../../graphyx/gui/Container.html" target="_self">Container</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/GUIActor.html#continue" target="_self">continue</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>GUIActor</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GUIActor</span><span class="result"> extends <span class="extype" name="scala.actors.Actor">Actor</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.actors.Actor">Actor</li><li class="in" name="scala.actors.ReplyableActor">ReplyableActor</li><li class="in" name="scala.actors.ReplyReactor">ReplyReactor</li><li class="in" name="scala.actors.ReplyableReactor">ReplyableReactor</li><li class="in" name="scala.actors.Reactor">Reactor</li><li class="in" name="scala.actors.AbstractActor">AbstractActor</li><li class="in" name="scala.actors.Replyable">Replyable</li><li class="in" name="scala.actors.OutputChannel">OutputChannel</li><li class="in" name="scala.actors.AbstractReactor">AbstractReactor</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#mailbox" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.mailbox</a>, <a href="#trapExit" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.trapExit</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/GUIActor.html#act%28%29" target="_self">act</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
         
         
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#scheduler" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.scheduler</a>, <a href="#mailboxSize" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.mailboxSize</a>, <a href="#send" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.send</a>, <a href="#receive" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.receive</a>, <a href="#receiveWithin" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.receiveWithin</a>, <a href="#react" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.react</a>, <a href="#reactWithin" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.reactWithin</a>, <a href="#!" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.!</a>, <a href="#forward" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.forward</a>, <a href="#!?" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.!?</a>, <a href="#!?" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.!?</a>, <a href="#!!" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.!!</a>, <a href="#!!" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.!!</a>, <a href="#reply" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.reply</a>, <a href="#?" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.?</a>, <a href="#sender" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.sender</a>, <a href="#receiver" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.receiver</a>, <a href="#scheduleActor" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.scheduleActor</a>, <a href="#start" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.start</a>, <a href="#link" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.link</a>, <a href="#link" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.link</a>, <a href="#unlink" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.unlink</a>, <a href="#exit" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.exit</a>, <a href="#exit" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.exit</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="scala.actors.ReplyReactor#!">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">!</span><span class="params">(<span name="msg">msg: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="container"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>container</em> : <a href="../../graphyx/gui/Container.html" target="_self">Container</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="continue"></a><dl>
-      <dt>
+    </li><li name="scala.actors.ReplyableActor#!!">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">!!</span><span class="params">(<span name="msg">msg: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.actors.Future">Future</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.ReplyableActor#!!">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">!!</span><span class="tparams">[<span name="A">A</span>]</span><span class="params">(<span name="msg">msg: <span class="extype" name="scala.Any">Any</span></span>, <span name="f">f: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.Any">Any</span>, A]</span>)</span><span class="result">: <span class="extype" name="scala.actors.Future">Future</span>[A]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.ReplyableActor#!?">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">!?</span><span class="params">(<span name="msec">msec: <span class="extype" name="scala.Long">Long</span></span>, <span name="msg">msg: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Option">Option</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.ReplyableActor#!?">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">!?</span><span class="params">(<span name="msg">msg: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.Actor#?">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">?</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.actors.GUIActor#act">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">act</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.actors.GUIActor#container">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">container</span><span class="result">: <a href="../gui/Container.html" class="extype" name="graphyx.gui.Container">Container</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.actors.GUIActor#continue">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">continue</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.actors.ReplyReactor#forward">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">forward</span><span class="params">(<span name="msg">msg: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.actors.Actor#link">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">link</span><span class="params">(<span name="body">body: ⇒ <span class="extype" name="scala.Unit">Unit</span></span>)</span><span class="result">: <span class="extype" name="scala.actors.Actor">Actor</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.Actor#link">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">link</span><span class="params">(<span name="to">to: <span class="extype" name="scala.actors.AbstractActor">AbstractActor</span></span>)</span><span class="result">: <span class="extype" name="scala.actors.AbstractActor">AbstractActor</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.Actor#react">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">react</span><span class="params">(<span name="f">f: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.Any">Any</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Nothing">Nothing</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.Actor#reactWithin">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">reactWithin</span><span class="params">(<span name="msec">msec: <span class="extype" name="scala.Long">Long</span></span>)</span><span class="params">(<span name="f">f: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.Any">Any</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Nothing">Nothing</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.Actor#receive">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">receive</span><span class="tparams">[<span name="R">R</span>]</span><span class="params">(<span name="f">f: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.Any">Any</span>, R]</span>)</span><span class="result">: R</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.Actor#receiveWithin">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">receiveWithin</span><span class="tparams">[<span name="R">R</span>]</span><span class="params">(<span name="msec">msec: <span class="extype" name="scala.Long">Long</span></span>)</span><span class="params">(<span name="f">f: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.Any">Any</span>, R]</span>)</span><span class="result">: R</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.Reactor#receiver">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">receiver</span><span class="result">: <span class="extype" name="scala.actors.Actor">Actor</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.Reactor#send">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">send</span><span class="params">(<span name="msg">msg: <span class="extype" name="scala.Any">Any</span></span>, <span name="replyTo">replyTo: <span class="extype" name="scala.actors.OutputChannel">OutputChannel</span>[<span class="extype" name="scala.Any">Any</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.Actor#start">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">start</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.actors.Actor">Actor</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.actors.Actor#trapExit">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">trapExit</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.Actor#unlink">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">unlink</span><span class="params">(<span name="from">from: <span class="extype" name="scala.actors.AbstractActor">AbstractActor</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>var</code>
-        <em>continue</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="act%28%29"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.actors.GUIActor#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GUIActor</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>act</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor</a>.<a href="#act" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.act</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/actors/PhysicsActor.html b/doc/graphyx/actors/PhysicsActor.html
index 53f230e..44973b0 100644
--- a/doc/graphyx/actors/PhysicsActor.html
+++ b/doc/graphyx/actors/PhysicsActor.html
@@ -1,202 +1,343 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class PhysicsActor in graphyx.actors</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.actors.PhysicsActor</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/actors$package.html" target="_self">graphyx.actors</a>
-        <br></br>
-        <span class="entity">class  PhysicsActor</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/actors/PhysicsActor"><code>graphyx/actors/PhysicsActor.scala</code></a>]
-      </div><hr></hr>
-      <a name="PhysicsActor"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>class</code>
-        <em>PhysicsActor</em>
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">actors</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/PhysicsActor.html#continue" target="_self">continue</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/PhysicsActor.html#simulate" target="_self">simulate</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/PhysicsActor.html#world" target="_self">world</a></em>
-         : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#mailbox" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.mailbox</a>, <a href="#trapExit" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.trapExit</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/PhysicsActor.html#act%28%29" target="_self">act</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/PhysicsActor.html#fps" target="_self">fps</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#scheduler" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.scheduler</a>, <a href="#mailboxSize" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.mailboxSize</a>, <a href="#send" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.send</a>, <a href="#receive" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.receive</a>, <a href="#receiveWithin" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.receiveWithin</a>, <a href="#react" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.react</a>, <a href="#reactWithin" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.reactWithin</a>, <a href="#!" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.!</a>, <a href="#forward" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.forward</a>, <a href="#!?" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.!?</a>, <a href="#!?" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.!?</a>, <a href="#!!" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.!!</a>, <a href="#!!" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.!!</a>, <a href="#reply" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.reply</a>, <a href="#?" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.?</a>, <a href="#sender" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.sender</a>, <a href="#receiver" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.receiver</a>, <a href="#scheduleActor" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.scheduleActor</a>, <a href="#start" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.start</a>, <a href="#link" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.link</a>, <a href="#link" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.link</a>, <a href="#unlink" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.unlink</a>, <a href="#exit" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.exit</a>, <a href="#exit" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.exit</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>PhysicsActor</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">PhysicsActor</span><span class="result"> extends <span class="extype" name="scala.actors.Actor">Actor</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="world"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.actors.Actor">Actor</li><li class="in" name="scala.actors.ReplyableActor">ReplyableActor</li><li class="in" name="scala.actors.ReplyReactor">ReplyReactor</li><li class="in" name="scala.actors.ReplyableReactor">ReplyableReactor</li><li class="in" name="scala.actors.Reactor">Reactor</li><li class="in" name="scala.actors.AbstractActor">AbstractActor</li><li class="in" name="scala.actors.Replyable">Replyable</li><li class="in" name="scala.actors.OutputChannel">OutputChannel</li><li class="in" name="scala.actors.AbstractReactor">AbstractReactor</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code></code>
-        <code>var</code>
-        <em>world</em> : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="continue"></a><dl>
-      <dt>
         
-        <code></code>
-        <code>var</code>
-        <em>continue</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="simulate"></a><dl>
-      <dt>
         
-        <code></code>
-        <code>var</code>
-        <em>simulate</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="fps"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="scala.actors.ReplyReactor#!">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">!</span><span class="params">(<span name="msg">msg: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.ReplyableActor#!!">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">!!</span><span class="params">(<span name="msg">msg: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.actors.Future">Future</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.ReplyableActor#!!">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">!!</span><span class="tparams">[<span name="A">A</span>]</span><span class="params">(<span name="msg">msg: <span class="extype" name="scala.Any">Any</span></span>, <span name="f">f: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.Any">Any</span>, A]</span>)</span><span class="result">: <span class="extype" name="scala.actors.Future">Future</span>[A]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.ReplyableActor#!?">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">!?</span><span class="params">(<span name="msec">msec: <span class="extype" name="scala.Long">Long</span></span>, <span name="msg">msg: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Option">Option</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.ReplyableActor#!?">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">!?</span><span class="params">(<span name="msg">msg: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.Actor#?">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">?</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.actors.PhysicsActor#act">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">act</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.actors.PhysicsActor#continue">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">continue</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.actors.ReplyReactor#forward">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">forward</span><span class="params">(<span name="msg">msg: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.actors.PhysicsActor#fps">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fps</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.actors.Actor#link">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">link</span><span class="params">(<span name="body">body: ⇒ <span class="extype" name="scala.Unit">Unit</span></span>)</span><span class="result">: <span class="extype" name="scala.actors.Actor">Actor</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.Actor#link">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">link</span><span class="params">(<span name="to">to: <span class="extype" name="scala.actors.AbstractActor">AbstractActor</span></span>)</span><span class="result">: <span class="extype" name="scala.actors.AbstractActor">AbstractActor</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.Actor#react">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">react</span><span class="params">(<span name="f">f: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.Any">Any</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Nothing">Nothing</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.Actor#reactWithin">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">reactWithin</span><span class="params">(<span name="msec">msec: <span class="extype" name="scala.Long">Long</span></span>)</span><span class="params">(<span name="f">f: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.Any">Any</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Nothing">Nothing</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.Actor#receive">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">receive</span><span class="tparams">[<span name="R">R</span>]</span><span class="params">(<span name="f">f: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.Any">Any</span>, R]</span>)</span><span class="result">: R</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.Actor#receiveWithin">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">receiveWithin</span><span class="tparams">[<span name="R">R</span>]</span><span class="params">(<span name="msec">msec: <span class="extype" name="scala.Long">Long</span></span>)</span><span class="params">(<span name="f">f: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.Any">Any</span>, R]</span>)</span><span class="result">: R</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.Reactor#receiver">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">receiver</span><span class="result">: <span class="extype" name="scala.actors.Actor">Actor</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.Reactor#send">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">send</span><span class="params">(<span name="msg">msg: <span class="extype" name="scala.Any">Any</span></span>, <span name="replyTo">replyTo: <span class="extype" name="scala.actors.OutputChannel">OutputChannel</span>[<span class="extype" name="scala.Any">Any</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.actors.PhysicsActor#simulate">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">simulate</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.Actor#start">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">start</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.actors.Actor">Actor</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.actors.Actor#trapExit">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">trapExit</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.actors.Actor#unlink">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">unlink</span><span class="params">(<span name="from">from: <span class="extype" name="scala.actors.AbstractActor">AbstractActor</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.actors.PhysicsActor#world">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">world</span><span class="result">: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>fps</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="act%28%29"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.actors.PhysicsActor#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">PhysicsActor</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>act</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor</a>.<a href="#act" target="contentFrame" class="scala/actors/Actor">scala.actors.Actor.act</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/actors/SetWorld$object.html b/doc/graphyx/actors/SetWorld$object.html
deleted file mode 100644
index c1f59bf..0000000
--- a/doc/graphyx/actors/SetWorld$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object SetWorld in graphyx.actors</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/actors$package.html" target="_self">graphyx.actors</a>
-        <br></br>
-        <span class="entity">object  SetWorld</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/actors/SetWorld"><code>graphyx/actors/SetWorld.scala</code></a>]
-      </div><hr></hr>
-      <a name="SetWorld"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>SetWorld</em>
-      </dt>
-      <dd><code> extends </code>(<a href="../../sims/dynamics/World.html" target="_self">World</a>) =&gt; <a href="../../graphyx/actors/SetWorld.html" target="_self">SetWorld</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function1">scala.Function1</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function1">scala.Function1.toString</a>, <a href="#compose" target="contentFrame" class="scala/Function1">scala.Function1.compose</a>, <a href="#andThen" target="contentFrame" class="scala/Function1">scala.Function1.andThen</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/actors/SetWorld.html b/doc/graphyx/actors/SetWorld.html
index 2eacdd1..e48e30e 100644
--- a/doc/graphyx/actors/SetWorld.html
+++ b/doc/graphyx/actors/SetWorld.html
@@ -1,276 +1,217 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class SetWorld in graphyx.actors</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.actors.SetWorld</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/actors$package.html" target="_self">graphyx.actors</a>
-        <br></br>
-        <span class="entity">class  SetWorld</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/actors/SetWorld"><code>graphyx/actors/SetWorld.scala</code></a>]
-      </div><hr></hr>
-      <a name="SetWorld"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>SetWorld</em>(<code>val </code><em>world</em> : <a href="../../sims/dynamics/World.html" target="_self">World</a>)
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">actors</a></p>
 
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>SetWorld</h1>
+      </div>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/SetWorld.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/SetWorld.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/SetWorld.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/SetWorld.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/SetWorld.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/SetWorld.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">SetWorld</span><span class="params">(<span name="world">world: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>)</span><span class="result"> extends <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.actors.SetWorld#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.actors.SetWorld#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="graphyx.actors.SetWorld#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.actors.SetWorld#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.actors.SetWorld#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.actors.SetWorld#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.actors.SetWorld#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.actors.SetWorld#world">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">world</span><span class="result">: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.actors.SetWorld#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">SetWorld</span><span class="params">(<span name="world">world: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">SetWorld</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/actors/Start$.html b/doc/graphyx/actors/Start$.html
new file mode 100644
index 0000000..07e2465
--- /dev/null
+++ b/doc/graphyx/actors/Start$.html
@@ -0,0 +1,177 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.actors.Start</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">actors</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>Start</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Start</span><span class="result"> extends <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.actors.Start#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.actors.Start#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.actors.Start#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.actors.Start#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/actors/Start$object.html b/doc/graphyx/actors/Start$object.html
deleted file mode 100644
index 3d38727..0000000
--- a/doc/graphyx/actors/Start$object.html
+++ /dev/null
@@ -1,205 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Start in graphyx.actors</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/actors$package.html" target="_self">graphyx.actors</a>
-        <br></br>
-        <span class="entity">object  Start</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/actors/Start"><code>graphyx/actors/Start.scala</code></a>]
-      </div><hr></hr>
-      <a name="Start"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>object</code>
-        <em>Start</em>
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/Start$object.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/Start$object.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/Start$object.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>protected def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/Start$object.html#readResolve%28%29" target="_self">readResolve</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override final def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/Start$object.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="toString%28%29"></a><dl>
-      <dt>
-        
-        <code>override final</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr>
-<a name="readResolve%28%29"></a><dl>
-      <dt>
-        
-        <code>protected</code>
-        <code>def</code>
-        <em>readResolve</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/actors/Stop$.html b/doc/graphyx/actors/Stop$.html
new file mode 100644
index 0000000..1f24ac2
--- /dev/null
+++ b/doc/graphyx/actors/Stop$.html
@@ -0,0 +1,177 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.actors.Stop</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">actors</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>Stop</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Stop</span><span class="result"> extends <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.actors.Stop#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.actors.Stop#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.actors.Stop#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.actors.Stop#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/actors/Stop$object.html b/doc/graphyx/actors/Stop$object.html
deleted file mode 100644
index c4d3caf..0000000
--- a/doc/graphyx/actors/Stop$object.html
+++ /dev/null
@@ -1,205 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Stop in graphyx.actors</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/actors$package.html" target="_self">graphyx.actors</a>
-        <br></br>
-        <span class="entity">object  Stop</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/actors/Stop"><code>graphyx/actors/Stop.scala</code></a>]
-      </div><hr></hr>
-      <a name="Stop"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>object</code>
-        <em>Stop</em>
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/Stop$object.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/Stop$object.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/Stop$object.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>protected def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/Stop$object.html#readResolve%28%29" target="_self">readResolve</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override final def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/actors/Stop$object.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="toString%28%29"></a><dl>
-      <dt>
-        
-        <code>override final</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr>
-<a name="readResolve%28%29"></a><dl>
-      <dt>
-        
-        <code>protected</code>
-        <code>def</code>
-        <em>readResolve</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/actors/package.html b/doc/graphyx/actors/package.html
new file mode 100644
index 0000000..ad16685
--- /dev/null
+++ b/doc/graphyx/actors/package.html
@@ -0,0 +1,113 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.actors</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a></p>
+
+      <div id="definition">
+        <img src="../../lib/package_big.png" />
+        <h1>actors</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">actors</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        
+        
+        <div class="members" id="types">
+              <h3>Type Members</h3>
+              <ol><li name="graphyx.actors.GUIActor">
+      <h4 class="signature"><a href="GUIActor.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GUIActor</span><span class="result"> extends Actor</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.actors.PhysicsActor">
+      <h4 class="signature"><a href="PhysicsActor.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">PhysicsActor</span><span class="result"> extends Actor</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.actors.SetWorld">
+      <h4 class="signature"><a href="SetWorld.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">SetWorld</span><span class="params">(<span name="world">world: World</span>)</span><span class="result"> extends Product</span>
+      </span>
+      </a></h4>
+      
+    </li></ol>
+            </div>
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.actors.Exit">
+      <h4 class="signature"><a href="Exit$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Exit</span><span class="result"> extends Product</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.actors.FireEvent">
+      <h4 class="signature"><a href="FireEvent$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">FireEvent</span><span class="result"> extends Product</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.actors.Start">
+      <h4 class="signature"><a href="Start$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Start</span><span class="result"> extends Product</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.actors.Stop">
+      <h4 class="signature"><a href="Stop$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Stop</span><span class="result"> extends Product</span>
+      </span>
+      </a></h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics$content.html b/doc/graphyx/graphics$content.html
deleted file mode 100644
index b9d8189..0000000
--- a/doc/graphyx/graphics$content.html
+++ /dev/null
@@ -1,332 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>All classes and objects in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../script.js"></script>
-        </head>
-        <body onload="init()"><div class="page-title"><div>Simple Mechanics Simulator (SiMS) API</div></div><p><div>This document is the API specification for SiMS</div></p><table summary="" cellpadding="3" class="member">
-        <tr><td class="title" colspan="2">Class Summary</td></tr>
-        <tr>
-      <td class="modifiers" valign="top"> 
-        <code> trait</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/Drawable.html" target="_self">Drawable</a></em>
-        <code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        <div>Enthaelt Methoden und Felder fuer graphische Darstellungen.
- Alle Klassen die dieses Trait implementieren koennen graphisch dargestellt werden.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/GraphicalAABB.html" target="_self">GraphicalAABB</a></em>
-        (<code>val </code><em>real</em> : <a href="../sims/collision/AABB.html" target="_self">AABB</a>)<code> extends </code><a href="../sims/collision/AABB.html" target="_self">AABB</a><code> with </code><a href="../graphyx/graphics/GraphicalObject.html" target="_self">GraphicalObject</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/GraphicalBody.html" target="_self">GraphicalBody</a></em>
-        (<code>val </code><em>real</em> : <a href="../sims/dynamics/Body.html" target="_self">Body</a>)<code> extends </code><a href="../graphyx/graphics/GraphicalObject.html" target="_self">GraphicalObject</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/GraphicalCircle.html" target="_self">GraphicalCircle</a></em>
-        (<code>val </code><em>real</em> : <a href="../sims/dynamics/Circle.html" target="_self">Circle</a>)<code> extends </code><a href="../sims/dynamics/Circle.html" target="_self">Circle</a><code> with </code><a href="../graphyx/graphics/GraphicalShape.html" target="_self">GraphicalShape</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/GraphicalCollision.html" target="_self">GraphicalCollision</a></em>
-        (<code>val </code><em>real</em> : <a href="../sims/collision/Collision.html" target="_self">Collision</a>)<code> extends </code><a href="../graphyx/graphics/GraphicalObject.html" target="_self">GraphicalObject</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/GraphicalDistanceJoint.html" target="_self">GraphicalDistanceJoint</a></em>
-        (<code>val </code><em>real</em> : <a href="../sims/dynamics/joints/DistanceJoint.html" target="_self">DistanceJoint</a>)<code> extends </code><a href="../graphyx/graphics/GraphicalJoint.html" target="_self">GraphicalJoint</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> trait</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/GraphicalJoint.html" target="_self">GraphicalJoint</a></em>
-        <code> extends </code><a href="../graphyx/graphics/GraphicalObject.html" target="_self">GraphicalObject</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> trait</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/GraphicalObject.html" target="_self">GraphicalObject</a></em>
-        <code> extends </code><a href="../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        
-        <div>Only copies functional info! (e.g. Graphical world does not include shapes, bodies).</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/GraphicalPair.html" target="_self">GraphicalPair</a></em>
-        (<code>val </code><em>real</em> : <a href="../sims/collision/Pair.html" target="_self">Pair</a>)<code> extends </code><a href="../graphyx/graphics/GraphicalObject.html" target="_self">GraphicalObject</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/GraphicalRectangle.html" target="_self">GraphicalRectangle</a></em>
-        (<code>val </code><em>real</em> : <a href="../sims/dynamics/Rectangle.html" target="_self">Rectangle</a>)<code> extends </code><a href="../sims/dynamics/Rectangle.html" target="_self">Rectangle</a><code> with </code><a href="../graphyx/graphics/GraphicalShape.html" target="_self">GraphicalShape</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/GraphicalRegularPolygon.html" target="_self">GraphicalRegularPolygon</a></em>
-        (<code>val </code><em>real</em> : <a href="../sims/dynamics/RegularPolygon.html" target="_self">RegularPolygon</a>)<code> extends </code><a href="../sims/dynamics/RegularPolygon.html" target="_self">RegularPolygon</a><code> with </code><a href="../graphyx/graphics/GraphicalShape.html" target="_self">GraphicalShape</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/GraphicalRevoluteJoint.html" target="_self">GraphicalRevoluteJoint</a></em>
-        (<code>val </code><em>real</em> : <a href="../sims/dynamics/joints/RevoluteJoint.html" target="_self">RevoluteJoint</a>)<code> extends </code><a href="../graphyx/graphics/GraphicalJoint.html" target="_self">GraphicalJoint</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> trait</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/GraphicalShape.html" target="_self">GraphicalShape</a></em>
-        <code> extends </code><a href="../sims/dynamics/Shape.html" target="_self">Shape</a><code> with </code><a href="../graphyx/graphics/GraphicalObject.html" target="_self">GraphicalObject</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/GraphicalSpringJoint.html" target="_self">GraphicalSpringJoint</a></em>
-        (<code>val </code><em>real</em> : <a href="../sims/dynamics/joints/SpringJoint.html" target="_self">SpringJoint</a>)<code> extends </code><a href="../graphyx/graphics/GraphicalJoint.html" target="_self">GraphicalJoint</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/GraphicalWorld.html" target="_self">GraphicalWorld</a></em>
-        (<code>val </code><em>real</em> : <a href="../sims/dynamics/World.html" target="_self">World</a>)<code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/Scene.html" target="_self">Scene</a></em>
-        (<code>val </code><em>real</em> : <a href="../sims/dynamics/World.html" target="_self">World</a>)<code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        
-      </td>
-    </tr>        
-        </table>
-<table summary="" cellpadding="3" class="member">
-        <tr><td class="title" colspan="2">Object Summary</td></tr>
-        <tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/GraphicalAABB$object.html" target="_self">GraphicalAABB</a></em>
-        <code> extends </code>(<a href="../sims/collision/AABB.html" target="_self">AABB</a>) =&gt; <a href="../graphyx/graphics/GraphicalAABB.html" target="_self">GraphicalAABB</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/GraphicalBody$object.html" target="_self">GraphicalBody</a></em>
-        <code> extends </code>(<a href="../sims/dynamics/Body.html" target="_self">Body</a>) =&gt; <a href="../graphyx/graphics/GraphicalBody.html" target="_self">GraphicalBody</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/GraphicalCircle$object.html" target="_self">GraphicalCircle</a></em>
-        <code> extends </code>(<a href="../sims/dynamics/Circle.html" target="_self">Circle</a>) =&gt; <a href="../graphyx/graphics/GraphicalCircle.html" target="_self">GraphicalCircle</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/GraphicalCollision$object.html" target="_self">GraphicalCollision</a></em>
-        <code> extends </code>(<a href="../sims/collision/Collision.html" target="_self">Collision</a>) =&gt; <a href="../graphyx/graphics/GraphicalCollision.html" target="_self">GraphicalCollision</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/GraphicalDistanceJoint$object.html" target="_self">GraphicalDistanceJoint</a></em>
-        <code> extends </code>(<a href="../sims/dynamics/joints/DistanceJoint.html" target="_self">DistanceJoint</a>) =&gt; <a href="../graphyx/graphics/GraphicalDistanceJoint.html" target="_self">GraphicalDistanceJoint</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/GraphicalPair$object.html" target="_self">GraphicalPair</a></em>
-        <code> extends </code>(<a href="../sims/collision/Pair.html" target="_self">Pair</a>) =&gt; <a href="../graphyx/graphics/GraphicalPair.html" target="_self">GraphicalPair</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/GraphicalRectangle$object.html" target="_self">GraphicalRectangle</a></em>
-        <code> extends </code>(<a href="../sims/dynamics/Rectangle.html" target="_self">Rectangle</a>) =&gt; <a href="../graphyx/graphics/GraphicalRectangle.html" target="_self">GraphicalRectangle</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/GraphicalRegularPolygon$object.html" target="_self">GraphicalRegularPolygon</a></em>
-        <code> extends </code>(<a href="../sims/dynamics/RegularPolygon.html" target="_self">RegularPolygon</a>) =&gt; <a href="../graphyx/graphics/GraphicalRegularPolygon.html" target="_self">GraphicalRegularPolygon</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/GraphicalRevoluteJoint$object.html" target="_self">GraphicalRevoluteJoint</a></em>
-        <code> extends </code>(<a href="../sims/dynamics/joints/RevoluteJoint.html" target="_self">RevoluteJoint</a>) =&gt; <a href="../graphyx/graphics/GraphicalRevoluteJoint.html" target="_self">GraphicalRevoluteJoint</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/GraphicalSpringJoint$object.html" target="_self">GraphicalSpringJoint</a></em>
-        <code> extends </code>(<a href="../sims/dynamics/joints/SpringJoint.html" target="_self">SpringJoint</a>) =&gt; <a href="../graphyx/graphics/GraphicalSpringJoint.html" target="_self">GraphicalSpringJoint</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/GraphicalWorld$object.html" target="_self">GraphicalWorld</a></em>
-        <code> extends </code>(<a href="../sims/dynamics/World.html" target="_self">World</a>) =&gt; <a href="../graphyx/graphics/GraphicalWorld.html" target="_self">GraphicalWorld</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/Parser$object.html" target="_self">Parser</a></em>
-        <code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/graphics/Scene$object.html" target="_self">Scene</a></em>
-        <code> extends </code>(<a href="../sims/dynamics/World.html" target="_self">World</a>) =&gt; <a href="../graphyx/graphics/Scene.html" target="_self">Scene</a>
-        
-        
-      </td>
-    </tr>        
-        </table></body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics$package.html b/doc/graphyx/graphics$package.html
deleted file mode 100644
index 94f5f77..0000000
--- a/doc/graphyx/graphics$package.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>List of classes and objects in package graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../script.js"></script>
-        </head>
-        <body onload="init()"><table summary="" class="navigation">
-          <tr><td class="navigation-links" valign="top">
-            <a href="../graphyx/graphics$content.html" target="contentFrame">graphyx.graphics</a>
-          </td></tr>
-        </table><div><div class="kinds" id="Classes">Classes</div><ul class="list">
-        <li id="Classes_D"><a href="../graphyx/graphics/Drawable.html" target="contentFrame">Drawable</a></li>
-<li id="Classes_G"><a href="../graphyx/graphics/GraphicalAABB.html" target="contentFrame">GraphicalAABB</a></li>
-<li><a href="../graphyx/graphics/GraphicalBody.html" target="contentFrame">GraphicalBody</a></li>
-<li><a href="../graphyx/graphics/GraphicalCircle.html" target="contentFrame">GraphicalCircle</a></li>
-<li><a href="../graphyx/graphics/GraphicalCollision.html" target="contentFrame">GraphicalCollision</a></li>
-<li><a href="../graphyx/graphics/GraphicalDistanceJoint.html" target="contentFrame">GraphicalDistanceJoint</a></li>
-<li><a href="../graphyx/graphics/GraphicalJoint.html" target="contentFrame">GraphicalJoint</a></li>
-<li><a href="../graphyx/graphics/GraphicalObject.html" target="contentFrame">GraphicalObject</a></li>
-<li><a href="../graphyx/graphics/GraphicalPair.html" target="contentFrame">GraphicalPair</a></li>
-<li><a href="../graphyx/graphics/GraphicalRectangle.html" target="contentFrame">GraphicalRectangle</a></li>
-<li><a href="../graphyx/graphics/GraphicalRegularPolygon.html" target="contentFrame">GraphicalRegularPolygon</a></li>
-<li><a href="../graphyx/graphics/GraphicalRevoluteJoint.html" target="contentFrame">GraphicalRevoluteJoint</a></li>
-<li><a href="../graphyx/graphics/GraphicalShape.html" target="contentFrame">GraphicalShape</a></li>
-<li><a href="../graphyx/graphics/GraphicalSpringJoint.html" target="contentFrame">GraphicalSpringJoint</a></li>
-<li><a href="../graphyx/graphics/GraphicalWorld.html" target="contentFrame">GraphicalWorld</a></li>
-<li id="Classes_S"><a href="../graphyx/graphics/Scene.html" target="contentFrame">Scene</a></li>
-        </ul>
-<div class="kinds" id="Objects">Objects</div><ul class="list">
-        <li id="Objects_G"><a href="../graphyx/graphics/GraphicalAABB$object.html" target="contentFrame">GraphicalAABB</a></li>
-<li><a href="../graphyx/graphics/GraphicalBody$object.html" target="contentFrame">GraphicalBody</a></li>
-<li><a href="../graphyx/graphics/GraphicalCircle$object.html" target="contentFrame">GraphicalCircle</a></li>
-<li><a href="../graphyx/graphics/GraphicalCollision$object.html" target="contentFrame">GraphicalCollision</a></li>
-<li><a href="../graphyx/graphics/GraphicalDistanceJoint$object.html" target="contentFrame">GraphicalDistanceJoint</a></li>
-<li><a href="../graphyx/graphics/GraphicalPair$object.html" target="contentFrame">GraphicalPair</a></li>
-<li><a href="../graphyx/graphics/GraphicalRectangle$object.html" target="contentFrame">GraphicalRectangle</a></li>
-<li><a href="../graphyx/graphics/GraphicalRegularPolygon$object.html" target="contentFrame">GraphicalRegularPolygon</a></li>
-<li><a href="../graphyx/graphics/GraphicalRevoluteJoint$object.html" target="contentFrame">GraphicalRevoluteJoint</a></li>
-<li><a href="../graphyx/graphics/GraphicalSpringJoint$object.html" target="contentFrame">GraphicalSpringJoint</a></li>
-<li><a href="../graphyx/graphics/GraphicalWorld$object.html" target="contentFrame">GraphicalWorld</a></li>
-<li id="Objects_P"><a href="../graphyx/graphics/Parser$object.html" target="contentFrame">Parser</a></li>
-<li id="Objects_S"><a href="../graphyx/graphics/Scene$object.html" target="contentFrame">Scene</a></li>
-        </ul></div></body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/Drawable.html b/doc/graphyx/graphics/Drawable.html
index f5e00fc..58243d7 100644
--- a/doc/graphyx/graphics/Drawable.html
+++ b/doc/graphyx/graphics/Drawable.html
@@ -1,397 +1,337 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>trait Drawable in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.graphics.Drawable</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">trait  Drawable</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/Drawable"><code>graphyx/graphics/Drawable.scala</code></a>]
-      </div><hr></hr>
-      <a name="Drawable"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>trait</code>
-        <em>Drawable</em>
-      </dt>
-      <dd><code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a></dd>
-    </dl>
-      <dl><dd>Enthaelt Methoden und Felder fuer graphische Darstellungen.
- Alle Klassen die dieses Trait implementieren koennen graphisch dargestellt werden.</dd></dl>
-      <dl></dl>
-    <dl>
-      <dt style="margin:10px 0 0 20px;"><b>Direct Known Subclasses:</b></dt>
-      <dd><a href="../../graphyx/graphics/GraphicalObject.html" target="_self">GraphicalObject</a></dd>
-      </dl><hr></hr>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">graphics</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Drawable.html#g" target="_self">g</a></em>
-         : <a href="" target="contentFrame" class="java/awt/Graphics">java.awt.Graphics</a>
-        
-        <div>Java Graphics Objekt zur graphischen Darstellung</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Drawable.html#ppm" target="_self">ppm</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Anzahl von Pixeln pro Meter.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Drawable.html#scale" target="_self">scale</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Skala in der die graphischen Objekte gezeichnet werden.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Drawable.html#windowHeight" target="_self">windowHeight</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Hoehe des Fensters in Pixeln.</div>
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Drawable.html#correctY%28Double%29" target="_self">correctY</a></em>
-        (<em>y</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Drawable.html#draw%28%29" target="_self">draw</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Stellt das graphische Objekt dar.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Drawable.html#drawCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">drawCircle</a></em>
-        (<em>center</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <em>radius</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Malt einen Kreis auf <code>g</code>.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Drawable.html#drawLine%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawLine</a></em>
-        (<em>startPoint</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <em>endPoint</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Malt eine Linie auf <code>g</code>.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Drawable.html#drawPoint%28sims.geometry.Vector2D%29" target="_self">drawPoint</a></em>
-        (<em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Malt einen Punkt auf <code>g</code>.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Drawable.html#drawPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">drawPolygon</a></em>
-        (<em>points</em> : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Malt ein Polygon auf <code>g</code>.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Drawable.html#drawVector%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawVector</a></em>
-        (<em>v</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <em>p</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Malt einen Vektor auf <code>g</code>.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Drawable.html#fillCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">fillCircle</a></em>
-        (<em>center</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <em>radius</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Malt einen massiven Kreis auf <code>g</code>.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Drawable.html#fillPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">fillPolygon</a></em>
-        (<em>points</em> : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Malt ein massives Polygon auf <code>g</code>.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/trait_big.png" />
+        <h1>Drawable</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">trait</span>
+      <span class="symbol">
+        <span class="name">Drawable</span><span class="result"> extends AnyRef</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>Enthaelt Methoden und Felder fuer graphische Darstellungen.
+Alle Klassen die dieses Trait implementieren koennen graphisch dargestellt werden.</p></div>
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="g"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>g</em> : <a href="" target="contentFrame" class="java/awt/Graphics">java.awt.Graphics</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Java Graphics Objekt zur graphischen Darstellung</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="ppm"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>ppm</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Anzahl von Pixeln pro Meter.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="scale"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>scale</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Skala in der die graphischen Objekte gezeichnet werden.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="windowHeight"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>windowHeight</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Hoehe des Fensters in Pixeln.</dd></dl>
-      <dl></dl>
-    <hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="correctY%28Double%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>correctY</em>(<em>y</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>y - </code>zu korrigierender Wert</dd></dl>
-    <hr></hr>
-<a name="drawLine%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>drawLine</em>(<em>startPoint</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <em>endPoint</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Malt eine Linie auf <code>g</code>.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>startPoint - </code>Startpunkt in Weltkoordinaten</dd><dd><code>endPoint - </code>Endpunkt in Weltkoordinaten</dd></dl>
-    <hr></hr>
-<a name="fillPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>fillPolygon</em>(<em>points</em> : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Malt ein massives Polygon auf <code>g</code>.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>points - </code>Eckpunkte des Polygons in Weltkoordinaten</dd></dl>
-    <hr></hr>
-<a name="drawPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29"></a><dl>
-      <dt>
+      
+      
+      <div class="block">
+                known subclasses: <a href="GraphicalObject.html">GraphicalObject</a>
+              </div>
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>drawPolygon</em>(<em>points</em> : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Malt ein Polygon auf <code>g</code>.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>points - </code>Eckpunkte des Polygons in Weltkoordinaten</dd></dl>
-    <hr></hr>
-<a name="fillCircle%28sims.geometry.Vector2D%2CDouble%29"></a><dl>
-      <dt>
         
-        <code></code>
-        <code>def</code>
-        <em>fillCircle</em>(<em>center</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <em>radius</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Malt einen massiven Kreis auf <code>g</code>.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>center - </code>Mitte des Kreises in Weltkoordinaten</dd><dd><code>radius - </code>Radius des Kreises</dd></dl>
-    <hr></hr>
-<a name="drawCircle%28sims.geometry.Vector2D%2CDouble%29"></a><dl>
-      <dt>
         
-        <code></code>
-        <code>def</code>
-        <em>drawCircle</em>(<em>center</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <em>radius</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Malt einen Kreis auf <code>g</code>.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>center - </code>Mitte des Kreises in Weltkoordinaten</dd><dd><code>radius - </code>Radius des Kreises</dd></dl>
-    <hr></hr>
-<a name="drawPoint%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.graphics.Drawable#correctY">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctY</span><span class="params">(<span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent</p><div class="fullcomment">
+      <div class="comment cmt"><p>Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent.</p></div>
+      <dl class="paramcmts block"><dt class="param">y</dt><dd class="cmt"><p>zu korrigierender Wert</p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#draw">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">draw</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Stellt das graphische Objekt dar</p><div class="fullcomment">
+      <div class="comment cmt"><p>Stellt das graphische Objekt dar.</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawLine">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawLine</span><span class="params">(<span name="startPoint">startPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="endPoint">endPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt eine Linie auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt eine Linie auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">startPoint</dt><dd class="cmt"><p>Startpunkt in Weltkoordinaten</p></dd><dt class="param">endPoint</dt><dd class="cmt"><p>Endpunkt in Weltkoordinaten</p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPoint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPoint</span><span class="params">(<span name="point">point: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Punkt auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Punkt auf <code>g</code>.
+<p>
+Der Punkt wird von einem Kreis umgeben.</p></div>
+      <dl class="paramcmts block"><dt class="param">point</dt><dd class="cmt"><p>Punkt in Weltkoordinaten</p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawVector">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawVector</span><span class="params">(<span name="v">v: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="p">p: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Vektor auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Vektor auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">v</dt><dd class="cmt"><p>Vektor in Weltkoordinaten</p></dd><dt class="param">p</dt><dd class="cmt"><p>Ursprungspunkt in Weltkoordinaten</p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen massiven Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen massiven Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein massives Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein massives Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#g">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">g</span><span class="result">: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Java Graphics Objekt zur graphischen Darstellung</p><div class="fullcomment">
+      <div class="comment cmt"><p>Java Graphics Objekt zur graphischen Darstellung</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#ppm">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">ppm</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Anzahl von Pixeln pro Meter</p><div class="fullcomment">
+      <div class="comment cmt"><p>Anzahl von Pixeln pro Meter.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#scale">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">scale</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Skala in der die graphischen Objekte gezeichnet werden</p><div class="fullcomment">
+      <div class="comment cmt"><p>Skala in der die graphischen Objekte gezeichnet werden.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#windowHeight">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">windowHeight</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Hoehe des Fensters in Pixeln</p><div class="fullcomment">
+      <div class="comment cmt"><p>Hoehe des Fensters in Pixeln.</p></div>
+      
+      
+      
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>drawPoint</em>(<em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Malt einen Punkt auf <code>g</code>.
-   <p>
-   Der Punkt wird von einem Kreis umgeben.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>point - </code>Punkt in Weltkoordinaten</dd></dl>
-    <hr></hr>
-<a name="drawVector%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29"></a><dl>
-      <dt>
         
-        <code></code>
-        <code>def</code>
-        <em>drawVector</em>(<em>v</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <em>p</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Malt einen Vektor auf <code>g</code>.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>v - </code>Vektor in Weltkoordinaten</dd><dd><code>p - </code>Ursprungspunkt in Weltkoordinaten</dd></dl>
-    <hr></hr>
-<a name="draw%28%29"></a><dl>
-      <dt>
         
-        <code>abstract</code>
-        <code>def</code>
-        <em>draw</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Stellt das graphische Objekt dar.</dd></dl>
-      <dl></dl>
-    <hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/GraphicalAABB$object.html b/doc/graphyx/graphics/GraphicalAABB$object.html
deleted file mode 100644
index 02225f7..0000000
--- a/doc/graphyx/graphics/GraphicalAABB$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object GraphicalAABB in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">object  GraphicalAABB</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/GraphicalAABB"><code>graphyx/graphics/GraphicalAABB.scala</code></a>]
-      </div><hr></hr>
-      <a name="GraphicalAABB"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>GraphicalAABB</em>
-      </dt>
-      <dd><code> extends </code>(<a href="../../sims/collision/AABB.html" target="_self">AABB</a>) =&gt; <a href="../../graphyx/graphics/GraphicalAABB.html" target="_self">GraphicalAABB</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function1">scala.Function1</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function1">scala.Function1.toString</a>, <a href="#compose" target="contentFrame" class="scala/Function1">scala.Function1.compose</a>, <a href="#andThen" target="contentFrame" class="scala/Function1">scala.Function1.andThen</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/GraphicalAABB.html b/doc/graphyx/graphics/GraphicalAABB.html
index 6855bd7..1bb096d 100644
--- a/doc/graphyx/graphics/GraphicalAABB.html
+++ b/doc/graphyx/graphics/GraphicalAABB.html
@@ -1,355 +1,471 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class GraphicalAABB in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.graphics.GraphicalAABB</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">class  GraphicalAABB</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/GraphicalAABB"><code>graphyx/graphics/GraphicalAABB.scala</code></a>]
-      </div><hr></hr>
-      <a name="GraphicalAABB"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>GraphicalAABB</em>(<code>val </code><em>real</em> : <a href="../../sims/collision/AABB.html" target="_self">AABB</a>)
-      </dt>
-      <dd><code> extends </code><a href="../../sims/collision/AABB.html" target="_self">AABB</a><code> with </code><a href="../../graphyx/graphics/GraphicalObject.html" target="_self">GraphicalObject</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">graphics</a></p>
 
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/Drawable.html#g" target="_self">g</a>, <a href="../../graphyx/graphics/Drawable.html#ppm" target="_self">ppm</a>, <a href="../../graphyx/graphics/Drawable.html#scale" target="_self">scale</a>, <a href="../../graphyx/graphics/Drawable.html#windowHeight" target="_self">windowHeight</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../sims/collision/AABB.html" target="_self">AABB</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/collision/AABB.html#minVertex" target="_self">minVertex</a>, <a href="../../sims/collision/AABB.html#maxVertex" target="_self">maxVertex</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalAABB.html#draw%28%29" target="_self">draw</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Stellt das graphische Objekt dar.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalAABB.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalAABB.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalAABB.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalAABB.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalAABB.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalAABB.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/Drawable.html#correctY%28Double%29" target="_self">correctY</a>, <a href="../../graphyx/graphics/Drawable.html#drawLine%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawLine</a>, <a href="../../graphyx/graphics/Drawable.html#fillPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">fillPolygon</a>, <a href="../../graphyx/graphics/Drawable.html#drawPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">drawPolygon</a>, <a href="../../graphyx/graphics/Drawable.html#fillCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">fillCircle</a>, <a href="../../graphyx/graphics/Drawable.html#drawCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">drawCircle</a>, <a href="../../graphyx/graphics/Drawable.html#drawPoint%28sims.geometry.Vector2D%29" target="_self">drawPoint</a>, <a href="../../graphyx/graphics/Drawable.html#drawVector%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawVector</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../sims/collision/AABB.html" target="_self">AABB</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/collision/AABB.html#overlaps%28sims.collision.AABB%29" target="_self">overlaps</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>GraphicalAABB</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GraphicalAABB</span><span class="params">(<span name="real">real: <a href="../../sims/collision/AABB.html" class="extype" name="sims.collision.AABB">AABB</a></span>)</span><span class="result"> extends <a href="../../sims/collision/AABB.html" class="extype" name="sims.collision.AABB">AABB</a> with <a href="GraphicalObject.html" class="extype" name="graphyx.graphics.GraphicalObject">GraphicalObject</a> with <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="draw%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>draw</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Stellt das graphische Objekt dar.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/graphics/GraphicalObject.html" target="_self">GraphicalObject</a>.<a href="../../graphyx/graphics/GraphicalObject.html#draw%28%29" target="_self">draw</a>
-        </dd>
-      </dl><hr></hr>
-<a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/collision/AABB.html" target="_self">AABB</a>.<a href="../../sims/collision/AABB.html#hashCode%28%29" target="_self">hashCode</a>
-        </dd>
-      </dl><hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.graphics.GraphicalObject">GraphicalObject</li><li class="in" name="graphyx.graphics.Drawable">Drawable</li><li class="in" name="sims.collision.AABB">AABB</li><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/collision/AABB.html" target="_self">AABB</a>.<a href="../../sims/collision/AABB.html#toString%28%29" target="_self">toString</a>
-        </dd>
-      </dl><hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/collision/AABB.html" target="_self">AABB</a>.<a href="../../sims/collision/AABB.html#equals%28Any%29" target="_self">equals</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/collision/AABB.html" target="_self">AABB</a>.<a href="../../sims/collision/AABB.html#productPrefix" target="_self">productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.graphics.GraphicalAABB#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Drawable#correctY">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctY</span><span class="params">(<span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent</p><div class="fullcomment">
+      <div class="comment cmt"><p>Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent.</p></div>
+      <dl class="paramcmts block"><dt class="param">y</dt><dd class="cmt"><p>zu korrigierender Wert</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalAABB#draw">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">draw</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Stellt das graphische Objekt dar</p><div class="fullcomment">
+      <div class="comment cmt"><p>Stellt das graphische Objekt dar.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawLine">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawLine</span><span class="params">(<span name="startPoint">startPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="endPoint">endPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt eine Linie auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt eine Linie auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">startPoint</dt><dd class="cmt"><p>Startpunkt in Weltkoordinaten</p></dd><dt class="param">endPoint</dt><dd class="cmt"><p>Endpunkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPoint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPoint</span><span class="params">(<span name="point">point: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Punkt auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Punkt auf <code>g</code>.
+<p>
+Der Punkt wird von einem Kreis umgeben.</p></div>
+      <dl class="paramcmts block"><dt class="param">point</dt><dd class="cmt"><p>Punkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawVector">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawVector</span><span class="params">(<span name="v">v: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="p">p: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Vektor auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Vektor auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">v</dt><dd class="cmt"><p>Vektor in Weltkoordinaten</p></dd><dt class="param">p</dt><dd class="cmt"><p>Ursprungspunkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalAABB#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen massiven Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen massiven Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein massives Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein massives Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#g">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">g</span><span class="result">: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Java Graphics Objekt zur graphischen Darstellung</p><div class="fullcomment">
+      <div class="comment cmt"><p>Java Graphics Objekt zur graphischen Darstellung</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalAABB#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.AABB#maxVertex">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">maxVertex</span><span class="result">: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.AABB#minVertex">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">minVertex</span><span class="result">: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.AABB#overlaps">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">overlaps</span><span class="params">(<span name="box">box: <a href="../../sims/collision/AABB.html" class="extype" name="sims.collision.AABB">AABB</a></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Checks this AABB with <code>box</code> for overlap</p><div class="fullcomment">
+      <div class="comment cmt"><p>Checks this AABB with <code>box</code> for overlap.</p></div>
+      <dl class="paramcmts block"><dt class="param">box</dt><dd class="cmt"><p>AABB with which to check for overlap</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="../../sims/collision/AABB.html">AABB</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#ppm">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">ppm</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Anzahl von Pixeln pro Meter</p><div class="fullcomment">
+      <div class="comment cmt"><p>Anzahl von Pixeln pro Meter.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalAABB#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalAABB#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalAABB#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalAABB#real">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">real</span><span class="result">: <a href="../../sims/collision/AABB.html" class="extype" name="sims.collision.AABB">AABB</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Pointer to real object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Pointer to real object.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#scale">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">scale</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Skala in der die graphischen Objekte gezeichnet werden</p><div class="fullcomment">
+      <div class="comment cmt"><p>Skala in der die graphischen Objekte gezeichnet werden.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalAABB#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#windowHeight">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">windowHeight</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Hoehe des Fensters in Pixeln</p><div class="fullcomment">
+      <div class="comment cmt"><p>Hoehe des Fensters in Pixeln.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/collision/AABB.html" target="_self">AABB</a>.<a href="../../sims/collision/AABB.html#productArity" target="_self">productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.graphics.GraphicalAABB#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GraphicalAABB</span><span class="params">(<span name="real">real: <a href="../../sims/collision/AABB.html" class="extype" name="sims.collision.AABB">AABB</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.AABB#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GraphicalAABB</span><span class="params">(<span name="minVertex">minVertex: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="maxVertex">maxVertex: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GraphicalAABB</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/collision/AABB.html" target="_self">AABB</a>.<a href="../../sims/collision/AABB.html#productElement%28Int%29" target="_self">productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/GraphicalBody$object.html b/doc/graphyx/graphics/GraphicalBody$object.html
deleted file mode 100644
index cd8f5c8..0000000
--- a/doc/graphyx/graphics/GraphicalBody$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object GraphicalBody in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">object  GraphicalBody</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/GraphicalBody"><code>graphyx/graphics/GraphicalBody.scala</code></a>]
-      </div><hr></hr>
-      <a name="GraphicalBody"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>GraphicalBody</em>
-      </dt>
-      <dd><code> extends </code>(<a href="../../sims/dynamics/Body.html" target="_self">Body</a>) =&gt; <a href="../../graphyx/graphics/GraphicalBody.html" target="_self">GraphicalBody</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function1">scala.Function1</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function1">scala.Function1.toString</a>, <a href="#compose" target="contentFrame" class="scala/Function1">scala.Function1.compose</a>, <a href="#andThen" target="contentFrame" class="scala/Function1">scala.Function1.andThen</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/GraphicalBody.html b/doc/graphyx/graphics/GraphicalBody.html
index 8b3c88d..9e1870a 100644
--- a/doc/graphyx/graphics/GraphicalBody.html
+++ b/doc/graphyx/graphics/GraphicalBody.html
@@ -1,383 +1,455 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class GraphicalBody in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.graphics.GraphicalBody</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">class  GraphicalBody</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/GraphicalBody"><code>graphyx/graphics/GraphicalBody.scala</code></a>]
-      </div><hr></hr>
-      <a name="GraphicalBody"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>GraphicalBody</em>(<code>val </code><em>real</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>)
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/graphics/GraphicalObject.html" target="_self">GraphicalObject</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">graphics</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalBody.html#fixed" target="_self">fixed</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalBody.html#monitor" target="_self">monitor</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalBody.html#pos" target="_self">pos</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/Drawable.html#g" target="_self">g</a>, <a href="../../graphyx/graphics/Drawable.html#ppm" target="_self">ppm</a>, <a href="../../graphyx/graphics/Drawable.html#scale" target="_self">scale</a>, <a href="../../graphyx/graphics/Drawable.html#windowHeight" target="_self">windowHeight</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalBody.html#draw%28%29" target="_self">draw</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Stellt das graphische Objekt dar.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalBody.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalBody.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalBody.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalBody.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalBody.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalBody.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/Drawable.html#correctY%28Double%29" target="_self">correctY</a>, <a href="../../graphyx/graphics/Drawable.html#drawLine%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawLine</a>, <a href="../../graphyx/graphics/Drawable.html#fillPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">fillPolygon</a>, <a href="../../graphyx/graphics/Drawable.html#drawPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">drawPolygon</a>, <a href="../../graphyx/graphics/Drawable.html#fillCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">fillCircle</a>, <a href="../../graphyx/graphics/Drawable.html#drawCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">drawCircle</a>, <a href="../../graphyx/graphics/Drawable.html#drawPoint%28sims.geometry.Vector2D%29" target="_self">drawPoint</a>, <a href="../../graphyx/graphics/Drawable.html#drawVector%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawVector</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>GraphicalBody</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GraphicalBody</span><span class="params">(<span name="real">real: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>)</span><span class="result"> extends <a href="GraphicalObject.html" class="extype" name="graphyx.graphics.GraphicalObject">GraphicalObject</a> with <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="pos"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>pos</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="fixed"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>fixed</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="monitor"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>monitor</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="draw%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>draw</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Stellt das graphische Objekt dar.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/graphics/GraphicalObject.html" target="_self">GraphicalObject</a>.<a href="../../graphyx/graphics/GraphicalObject.html#draw%28%29" target="_self">draw</a>
-        </dd>
-      </dl><hr></hr>
-<a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="graphyx.graphics.GraphicalObject">GraphicalObject</li><li class="in" name="graphyx.graphics.Drawable">Drawable</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.graphics.GraphicalBody#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Drawable#correctY">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctY</span><span class="params">(<span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent</p><div class="fullcomment">
+      <div class="comment cmt"><p>Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent.</p></div>
+      <dl class="paramcmts block"><dt class="param">y</dt><dd class="cmt"><p>zu korrigierender Wert</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalBody#draw">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">draw</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Stellt das graphische Objekt dar</p><div class="fullcomment">
+      <div class="comment cmt"><p>Stellt das graphische Objekt dar.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawLine">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawLine</span><span class="params">(<span name="startPoint">startPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="endPoint">endPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt eine Linie auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt eine Linie auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">startPoint</dt><dd class="cmt"><p>Startpunkt in Weltkoordinaten</p></dd><dt class="param">endPoint</dt><dd class="cmt"><p>Endpunkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPoint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPoint</span><span class="params">(<span name="point">point: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Punkt auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Punkt auf <code>g</code>.
+<p>
+Der Punkt wird von einem Kreis umgeben.</p></div>
+      <dl class="paramcmts block"><dt class="param">point</dt><dd class="cmt"><p>Punkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawVector">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawVector</span><span class="params">(<span name="v">v: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="p">p: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Vektor auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Vektor auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">v</dt><dd class="cmt"><p>Vektor in Weltkoordinaten</p></dd><dt class="param">p</dt><dd class="cmt"><p>Ursprungspunkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalBody#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen massiven Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen massiven Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein massives Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein massives Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalBody#fixed">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">fixed</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Drawable#g">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">g</span><span class="result">: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Java Graphics Objekt zur graphischen Darstellung</p><div class="fullcomment">
+      <div class="comment cmt"><p>Java Graphics Objekt zur graphischen Darstellung</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalBody#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalBody#monitor">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">monitor</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalBody#pos">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">pos</span><span class="result">: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Drawable#ppm">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">ppm</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Anzahl von Pixeln pro Meter</p><div class="fullcomment">
+      <div class="comment cmt"><p>Anzahl von Pixeln pro Meter.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalBody#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalBody#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalBody#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalBody#real">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">real</span><span class="result">: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Pointer to real object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Pointer to real object.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#scale">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">scale</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Skala in der die graphischen Objekte gezeichnet werden</p><div class="fullcomment">
+      <div class="comment cmt"><p>Skala in der die graphischen Objekte gezeichnet werden.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalBody#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#windowHeight">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">windowHeight</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Hoehe des Fensters in Pixeln</p><div class="fullcomment">
+      <div class="comment cmt"><p>Hoehe des Fensters in Pixeln.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.graphics.GraphicalBody#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GraphicalBody</span><span class="params">(<span name="real">real: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GraphicalBody</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/GraphicalCircle$object.html b/doc/graphyx/graphics/GraphicalCircle$object.html
deleted file mode 100644
index bdf676e..0000000
--- a/doc/graphyx/graphics/GraphicalCircle$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object GraphicalCircle in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">object  GraphicalCircle</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/GraphicalCircle"><code>graphyx/graphics/GraphicalCircle.scala</code></a>]
-      </div><hr></hr>
-      <a name="GraphicalCircle"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>GraphicalCircle</em>
-      </dt>
-      <dd><code> extends </code>(<a href="../../sims/dynamics/Circle.html" target="_self">Circle</a>) =&gt; <a href="../../graphyx/graphics/GraphicalCircle.html" target="_self">GraphicalCircle</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function1">scala.Function1</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function1">scala.Function1.toString</a>, <a href="#compose" target="contentFrame" class="scala/Function1">scala.Function1.compose</a>, <a href="#andThen" target="contentFrame" class="scala/Function1">scala.Function1.andThen</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/GraphicalCircle.html b/doc/graphyx/graphics/GraphicalCircle.html
index 613c136..a9293f4 100644
--- a/doc/graphyx/graphics/GraphicalCircle.html
+++ b/doc/graphyx/graphics/GraphicalCircle.html
@@ -1,369 +1,770 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class GraphicalCircle in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.graphics.GraphicalCircle</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">class  GraphicalCircle</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/GraphicalCircle"><code>graphyx/graphics/GraphicalCircle.scala</code></a>]
-      </div><hr></hr>
-      <a name="GraphicalCircle"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>GraphicalCircle</em>(<code>val </code><em>real</em> : <a href="../../sims/dynamics/Circle.html" target="_self">Circle</a>)
-      </dt>
-      <dd><code> extends </code><a href="../../sims/dynamics/Circle.html" target="_self">Circle</a><code> with </code><a href="../../graphyx/graphics/GraphicalShape.html" target="_self">GraphicalShape</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">graphics</a></p>
 
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../graphyx/graphics/GraphicalShape.html" target="_self">GraphicalShape</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/GraphicalShape.html#uid" target="_self">uid</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/Drawable.html#g" target="_self">g</a>, <a href="../../graphyx/graphics/Drawable.html#ppm" target="_self">ppm</a>, <a href="../../graphyx/graphics/Drawable.html#scale" target="_self">scale</a>, <a href="../../graphyx/graphics/Drawable.html#windowHeight" target="_self">windowHeight</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../sims/dynamics/Circle.html" target="_self">Circle</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/dynamics/Circle.html#radius" target="_self">radius</a>, <a href="../../sims/dynamics/Circle.html#density" target="_self">density</a>, <a href="../../sims/dynamics/Circle.html#volume" target="_self">volume</a>, <a href="../../sims/dynamics/Circle.html#I" target="_self">I</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/dynamics/Shape.html#collidable" target="_self">collidable</a>, <a href="../../sims/dynamics/Shape.html#restitution" target="_self">restitution</a>, <a href="../../sims/dynamics/Shape.html#friction" target="_self">friction</a>, <a href="../../sims/dynamics/Shape.html#pos" target="_self">pos</a>, <a href="../../sims/dynamics/Shape.html#rotation" target="_self">rotation</a>, <a href="../../sims/dynamics/Shape.html#rotation0" target="_self">rotation0</a>, <a href="../../sims/dynamics/Shape.html#refLocalPos" target="_self">refLocalPos</a>, <a href="../../sims/dynamics/Shape.html#transientShapes" target="_self">transientShapes</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalCircle.html#draw%28%29" target="_self">draw</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Stellt das graphische Objekt dar.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalCircle.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalCircle.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalCircle.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalCircle.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalCircle.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalCircle.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/Drawable.html#correctY%28Double%29" target="_self">correctY</a>, <a href="../../graphyx/graphics/Drawable.html#drawLine%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawLine</a>, <a href="../../graphyx/graphics/Drawable.html#fillPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">fillPolygon</a>, <a href="../../graphyx/graphics/Drawable.html#drawPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">drawPolygon</a>, <a href="../../graphyx/graphics/Drawable.html#fillCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">fillCircle</a>, <a href="../../graphyx/graphics/Drawable.html#drawCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">drawCircle</a>, <a href="../../graphyx/graphics/Drawable.html#drawPoint%28sims.geometry.Vector2D%29" target="_self">drawPoint</a>, <a href="../../graphyx/graphics/Drawable.html#drawVector%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawVector</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../sims/dynamics/Circle.html" target="_self">Circle</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/dynamics/Circle.html#AABB" target="_self">AABB</a>, <a href="../../sims/dynamics/Circle.html#project%28sims.geometry.Vector2D%29" target="_self">project</a>, <a href="../../sims/dynamics/Circle.html#contains%28sims.geometry.Vector2D%29" target="_self">contains</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/dynamics/Shape.html#mass" target="_self">mass</a>, <a href="../../sims/dynamics/Shape.html#body" target="_self">body</a>, <a href="../../sims/dynamics/Shape.html#asBody" target="_self">asBody</a>, <a href="../../sims/dynamics/Shape.html#%7E%28sims.dynamics.Shape%29" target="_self">~</a>, <a href="../../sims/dynamics/Shape.html#%7E%28sims.dynamics.Body%29" target="_self">~</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>GraphicalCircle</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GraphicalCircle</span><span class="params">(<span name="real">real: <a href="../../sims/dynamics/Circle.html" class="extype" name="sims.dynamics.Circle">Circle</a></span>)</span><span class="result"> extends <a href="../../sims/dynamics/Circle.html" class="extype" name="sims.dynamics.Circle">Circle</a> with <a href="GraphicalShape.html" class="extype" name="graphyx.graphics.GraphicalShape">GraphicalShape</a> with <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="draw%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>draw</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Stellt das graphische Objekt dar.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/Circle.html" target="_self">Circle</a>.<a href="../../sims/dynamics/Circle.html#hashCode%28%29" target="_self">hashCode</a>
-        </dd>
-      </dl><hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.graphics.GraphicalShape">GraphicalShape</li><li class="in" name="graphyx.graphics.GraphicalObject">GraphicalObject</li><li class="in" name="graphyx.graphics.Drawable">Drawable</li><li class="in" name="sims.dynamics.Circle">Circle</li><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="sims.dynamics.Shape">Shape</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/Circle.html" target="_self">Circle</a>.<a href="../../sims/dynamics/Circle.html#toString%28%29" target="_self">toString</a>
-        </dd>
-      </dl><hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/Circle.html" target="_self">Circle</a>.<a href="../../sims/dynamics/Circle.html#equals%28Any%29" target="_self">equals</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/Circle.html" target="_self">Circle</a>.<a href="../../sims/dynamics/Circle.html#productPrefix" target="_self">productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.dynamics.Circle#AABB">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">AABB</span><span class="result">: <a href="../../sims/collision/AABB.html" class="extype" name="sims.collision.AABB">AABB</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns this shape's axis aligned bounding box</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns this shape's axis aligned bounding box.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Circle.html">Circle</a> ⇐ <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Circle#I">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">I</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Moment of inertia for a rotation about this shape's COM</p><div class="fullcomment">
+      <div class="comment cmt"><p>Moment of inertia for a rotation about this shape's COM.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Circle.html">Circle</a> ⇐ <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#asBody">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">asBody</span><span class="result">: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Creates a new body made out of tis shape</p><div class="fullcomment">
+      <div class="comment cmt"><p>Creates a new body made out of tis shape.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#body">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">body</span><span class="result">: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns this shape's containing body</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns this shape's containing body.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalCircle#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Shape#collidable">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">collidable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Flag determining this shapes ability to collide with other shapes</p><div class="fullcomment">
+      <div class="comment cmt"><p>Flag determining this shapes ability to collide with other shapes.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Circle#contains">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">contains</span><span class="params">(<span name="point">point: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Checks if the point <code>point</code> is contained in this shape</p><div class="fullcomment">
+      <div class="comment cmt"><p>Checks if the point <code>point</code> is contained in this shape.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Circle.html">Circle</a> ⇐ <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#correctY">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctY</span><span class="params">(<span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent</p><div class="fullcomment">
+      <div class="comment cmt"><p>Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent.</p></div>
+      <dl class="paramcmts block"><dt class="param">y</dt><dd class="cmt"><p>zu korrigierender Wert</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Circle#density">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">density</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Density</p><div class="fullcomment">
+      <div class="comment cmt"><p>Density. (Mass per area)</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Circle.html">Circle</a> ⇐ <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalCircle#draw">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">draw</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Stellt das graphische Objekt dar</p><div class="fullcomment">
+      <div class="comment cmt"><p>Stellt das graphische Objekt dar.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawLine">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawLine</span><span class="params">(<span name="startPoint">startPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="endPoint">endPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt eine Linie auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt eine Linie auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">startPoint</dt><dd class="cmt"><p>Startpunkt in Weltkoordinaten</p></dd><dt class="param">endPoint</dt><dd class="cmt"><p>Endpunkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPoint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPoint</span><span class="params">(<span name="point">point: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Punkt auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Punkt auf <code>g</code>.
+<p>
+Der Punkt wird von einem Kreis umgeben.</p></div>
+      <dl class="paramcmts block"><dt class="param">point</dt><dd class="cmt"><p>Punkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawVector">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawVector</span><span class="params">(<span name="v">v: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="p">p: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Vektor auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Vektor auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">v</dt><dd class="cmt"><p>Vektor in Weltkoordinaten</p></dd><dt class="param">p</dt><dd class="cmt"><p>Ursprungspunkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalCircle#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen massiven Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen massiven Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein massives Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein massives Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#friction">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">friction</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Part of the coefficient of friction for a collision between this shape and another</p><div class="fullcomment">
+      <div class="comment cmt"><p>Part of the coefficient of friction for a collision between this shape and another.
+The coefficient of friction is calculated out of the product of this part and the other shape's part.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#g">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">g</span><span class="result">: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Java Graphics Objekt zur graphischen Darstellung</p><div class="fullcomment">
+      <div class="comment cmt"><p>Java Graphics Objekt zur graphischen Darstellung</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalCircle#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#mass">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">mass</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the mass of this shape</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the mass of this shape. The mass is given by volume times density.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#pos">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">pos</span><span class="result">: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Position of this shape's COM (in world coordinates)</p><div class="fullcomment">
+      <div class="comment cmt"><p>Position of this shape's COM (in world coordinates).</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#ppm">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">ppm</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Anzahl von Pixeln pro Meter</p><div class="fullcomment">
+      <div class="comment cmt"><p>Anzahl von Pixeln pro Meter.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalCircle#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalCircle#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalCircle#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Circle#project">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">project</span><span class="params">(<span name="axis">axis: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <a href="../../sims/geometry/Projection.html" class="extype" name="sims.geometry.Projection">Projection</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the projection of this shape onto the line given by the directional vector <code>axis</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the projection of this shape onto the line given by the directional vector <code>axis</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">axis</dt><dd class="cmt"><p>directional vector of the line</p></dd><dt>returns</dt><dd class="cmt"><p>projection of this shape</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Circle.html">Circle</a> ⇐ <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Circle#radius">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">radius</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalCircle#real">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">real</span><span class="result">: <a href="../../sims/dynamics/Circle.html" class="extype" name="sims.dynamics.Circle">Circle</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Pointer to real object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Pointer to real object.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#refLocalPos">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">refLocalPos</span><span class="result">: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Local position of this shape's body COM to its COM at a body rotation of zero</p><div class="fullcomment">
+      <div class="comment cmt"><p>Local position of this shape's body COM to its COM at a body rotation of zero.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#restitution">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">restitution</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Part of the coefficient of restitution for a collision between this shape and another</p><div class="fullcomment">
+      <div class="comment cmt"><p>Part of the coefficient of restitution for a collision between this shape and another.
+The coefficient of restitution is calculated out of the product of this part and the other shape's part.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#rotation">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">rotation</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Rotation of this shape about its COM</p><div class="fullcomment">
+      <div class="comment cmt"><p>Rotation of this shape about its COM.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#rotation0">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">rotation0</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Initial rotation</p><div class="fullcomment">
+      <div class="comment cmt"><p>Initial rotation. Rotation of this shape before it was added to a body.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#scale">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">scale</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Skala in der die graphischen Objekte gezeichnet werden</p><div class="fullcomment">
+      <div class="comment cmt"><p>Skala in der die graphischen Objekte gezeichnet werden.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalCircle#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#transientShapes">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">transientShapes</span><span class="result">: <span class="extype" name="scala.collection.mutable.Set">Set</span>[<a href="../../sims/dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Shapes with which this shape cannot collide</p><div class="fullcomment">
+      <div class="comment cmt"><p>Shapes with which this shape cannot collide.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalShape#uid">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">uid</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Unique identification number</p><div class="fullcomment">
+      <div class="comment cmt"><p>Unique identification number.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="GraphicalShape.html">GraphicalShape</a> ⇐ <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Circle#volume">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">volume</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Volume</p><div class="fullcomment">
+      <div class="comment cmt"><p>Volume. The volume is actually equivalent to this shape's area (SiMS is in 2D)
+and is used with this shape's density to calculate its mass.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Circle.html">Circle</a> ⇐ <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#windowHeight">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">windowHeight</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Hoehe des Fensters in Pixeln</p><div class="fullcomment">
+      <div class="comment cmt"><p>Hoehe des Fensters in Pixeln.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#~">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">~</span><span class="params">(<span name="b">b: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>)</span><span class="result">: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Creates a new body out of this shape and the shapes of body <code>b</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Creates a new body out of this shape and the shapes of body <code>b</code>.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#~">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">~</span><span class="params">(<span name="s">s: <a href="../../sims/dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>)</span><span class="result">: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Creates a new body out of this shape and the shape <code>s</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Creates a new body out of this shape and the shape <code>s</code>.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/Circle.html" target="_self">Circle</a>.<a href="../../sims/dynamics/Circle.html#productArity" target="_self">productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.graphics.GraphicalCircle#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GraphicalCircle</span><span class="params">(<span name="real">real: <a href="../../sims/dynamics/Circle.html" class="extype" name="sims.dynamics.Circle">Circle</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Circle#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GraphicalCircle</span><span class="params">(<span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>, <span name="density">density: <span class="extype" name="scala.Double">Double</span></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Shape#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GraphicalCircle</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/Circle.html" target="_self">Circle</a>.<a href="../../sims/dynamics/Circle.html#productElement%28Int%29" target="_self">productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/GraphicalCollision$object.html b/doc/graphyx/graphics/GraphicalCollision$object.html
deleted file mode 100644
index 6c382a1..0000000
--- a/doc/graphyx/graphics/GraphicalCollision$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object GraphicalCollision in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">object  GraphicalCollision</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/GraphicalCollision"><code>graphyx/graphics/GraphicalCollision.scala</code></a>]
-      </div><hr></hr>
-      <a name="GraphicalCollision"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>GraphicalCollision</em>
-      </dt>
-      <dd><code> extends </code>(<a href="../../sims/collision/Collision.html" target="_self">Collision</a>) =&gt; <a href="../../graphyx/graphics/GraphicalCollision.html" target="_self">GraphicalCollision</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function1">scala.Function1</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function1">scala.Function1.toString</a>, <a href="#compose" target="contentFrame" class="scala/Function1">scala.Function1.compose</a>, <a href="#andThen" target="contentFrame" class="scala/Function1">scala.Function1.andThen</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/GraphicalCollision.html b/doc/graphyx/graphics/GraphicalCollision.html
index 4d8c1e9..7269402 100644
--- a/doc/graphyx/graphics/GraphicalCollision.html
+++ b/doc/graphyx/graphics/GraphicalCollision.html
@@ -1,363 +1,447 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class GraphicalCollision in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.graphics.GraphicalCollision</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">class  GraphicalCollision</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/GraphicalCollision"><code>graphyx/graphics/GraphicalCollision.scala</code></a>]
-      </div><hr></hr>
-      <a name="GraphicalCollision"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>GraphicalCollision</em>(<code>val </code><em>real</em> : <a href="../../sims/collision/Collision.html" target="_self">Collision</a>)
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/graphics/GraphicalObject.html" target="_self">GraphicalObject</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">graphics</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalCollision.html#normal" target="_self">normal</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalCollision.html#points" target="_self">points</a></em>
-         : <a href="" target="contentFrame" class="scala/Iterable">scala.Iterable</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/Drawable.html#g" target="_self">g</a>, <a href="../../graphyx/graphics/Drawable.html#ppm" target="_self">ppm</a>, <a href="../../graphyx/graphics/Drawable.html#scale" target="_self">scale</a>, <a href="../../graphyx/graphics/Drawable.html#windowHeight" target="_self">windowHeight</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalCollision.html#draw%28%29" target="_self">draw</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Stellt das graphische Objekt dar.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalCollision.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalCollision.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalCollision.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalCollision.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalCollision.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalCollision.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/Drawable.html#correctY%28Double%29" target="_self">correctY</a>, <a href="../../graphyx/graphics/Drawable.html#drawLine%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawLine</a>, <a href="../../graphyx/graphics/Drawable.html#fillPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">fillPolygon</a>, <a href="../../graphyx/graphics/Drawable.html#drawPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">drawPolygon</a>, <a href="../../graphyx/graphics/Drawable.html#fillCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">fillCircle</a>, <a href="../../graphyx/graphics/Drawable.html#drawCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">drawCircle</a>, <a href="../../graphyx/graphics/Drawable.html#drawPoint%28sims.geometry.Vector2D%29" target="_self">drawPoint</a>, <a href="../../graphyx/graphics/Drawable.html#drawVector%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawVector</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>GraphicalCollision</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GraphicalCollision</span><span class="params">(<span name="real">real: <a href="../../sims/collision/Collision.html" class="extype" name="sims.collision.Collision">Collision</a></span>)</span><span class="result"> extends <a href="GraphicalObject.html" class="extype" name="graphyx.graphics.GraphicalObject">GraphicalObject</a> with <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="points"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>points</em> : <a href="" target="contentFrame" class="scala/Iterable">scala.Iterable</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="normal"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>normal</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="draw%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>draw</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Stellt das graphische Objekt dar.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/graphics/GraphicalObject.html" target="_self">GraphicalObject</a>.<a href="../../graphyx/graphics/GraphicalObject.html#draw%28%29" target="_self">draw</a>
-        </dd>
-      </dl><hr></hr>
-<a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="graphyx.graphics.GraphicalObject">GraphicalObject</li><li class="in" name="graphyx.graphics.Drawable">Drawable</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.graphics.GraphicalCollision#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Drawable#correctY">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctY</span><span class="params">(<span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent</p><div class="fullcomment">
+      <div class="comment cmt"><p>Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent.</p></div>
+      <dl class="paramcmts block"><dt class="param">y</dt><dd class="cmt"><p>zu korrigierender Wert</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalCollision#draw">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">draw</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Stellt das graphische Objekt dar</p><div class="fullcomment">
+      <div class="comment cmt"><p>Stellt das graphische Objekt dar.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawLine">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawLine</span><span class="params">(<span name="startPoint">startPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="endPoint">endPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt eine Linie auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt eine Linie auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">startPoint</dt><dd class="cmt"><p>Startpunkt in Weltkoordinaten</p></dd><dt class="param">endPoint</dt><dd class="cmt"><p>Endpunkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPoint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPoint</span><span class="params">(<span name="point">point: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Punkt auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Punkt auf <code>g</code>.
+<p>
+Der Punkt wird von einem Kreis umgeben.</p></div>
+      <dl class="paramcmts block"><dt class="param">point</dt><dd class="cmt"><p>Punkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawVector">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawVector</span><span class="params">(<span name="v">v: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="p">p: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Vektor auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Vektor auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">v</dt><dd class="cmt"><p>Vektor in Weltkoordinaten</p></dd><dt class="param">p</dt><dd class="cmt"><p>Ursprungspunkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalCollision#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen massiven Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen massiven Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein massives Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein massives Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#g">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">g</span><span class="result">: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Java Graphics Objekt zur graphischen Darstellung</p><div class="fullcomment">
+      <div class="comment cmt"><p>Java Graphics Objekt zur graphischen Darstellung</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalCollision#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalCollision#normal">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">normal</span><span class="result">: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalCollision#points">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">points</span><span class="result">: <span class="extype" name="scala.collection.Iterable">Iterable</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Drawable#ppm">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">ppm</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Anzahl von Pixeln pro Meter</p><div class="fullcomment">
+      <div class="comment cmt"><p>Anzahl von Pixeln pro Meter.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalCollision#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalCollision#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalCollision#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalCollision#real">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">real</span><span class="result">: <a href="../../sims/collision/Collision.html" class="extype" name="sims.collision.Collision">Collision</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Pointer to real object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Pointer to real object.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#scale">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">scale</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Skala in der die graphischen Objekte gezeichnet werden</p><div class="fullcomment">
+      <div class="comment cmt"><p>Skala in der die graphischen Objekte gezeichnet werden.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalCollision#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#windowHeight">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">windowHeight</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Hoehe des Fensters in Pixeln</p><div class="fullcomment">
+      <div class="comment cmt"><p>Hoehe des Fensters in Pixeln.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.graphics.GraphicalCollision#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GraphicalCollision</span><span class="params">(<span name="real">real: <a href="../../sims/collision/Collision.html" class="extype" name="sims.collision.Collision">Collision</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GraphicalCollision</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/GraphicalDistanceJoint$object.html b/doc/graphyx/graphics/GraphicalDistanceJoint$object.html
deleted file mode 100644
index 709089b..0000000
--- a/doc/graphyx/graphics/GraphicalDistanceJoint$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object GraphicalDistanceJoint in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">object  GraphicalDistanceJoint</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/GraphicalDistanceJoint"><code>graphyx/graphics/GraphicalDistanceJoint.scala</code></a>]
-      </div><hr></hr>
-      <a name="GraphicalDistanceJoint"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>GraphicalDistanceJoint</em>
-      </dt>
-      <dd><code> extends </code>(<a href="../../sims/dynamics/joints/DistanceJoint.html" target="_self">DistanceJoint</a>) =&gt; <a href="../../graphyx/graphics/GraphicalDistanceJoint.html" target="_self">GraphicalDistanceJoint</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function1">scala.Function1</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function1">scala.Function1.toString</a>, <a href="#compose" target="contentFrame" class="scala/Function1">scala.Function1.compose</a>, <a href="#andThen" target="contentFrame" class="scala/Function1">scala.Function1.andThen</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/GraphicalDistanceJoint.html b/doc/graphyx/graphics/GraphicalDistanceJoint.html
index bb001e3..d91ae56 100644
--- a/doc/graphyx/graphics/GraphicalDistanceJoint.html
+++ b/doc/graphyx/graphics/GraphicalDistanceJoint.html
@@ -1,356 +1,447 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class GraphicalDistanceJoint in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.graphics.GraphicalDistanceJoint</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">class  GraphicalDistanceJoint</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/GraphicalDistanceJoint"><code>graphyx/graphics/GraphicalDistanceJoint.scala</code></a>]
-      </div><hr></hr>
-      <a name="GraphicalDistanceJoint"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>GraphicalDistanceJoint</em>(<code>val </code><em>real</em> : <a href="../../sims/dynamics/joints/DistanceJoint.html" target="_self">DistanceJoint</a>)
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/graphics/GraphicalJoint.html" target="_self">GraphicalJoint</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">graphics</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalDistanceJoint.html#connection1" target="_self">connection1</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalDistanceJoint.html#connection2" target="_self">connection2</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/Drawable.html#g" target="_self">g</a>, <a href="../../graphyx/graphics/Drawable.html#ppm" target="_self">ppm</a>, <a href="../../graphyx/graphics/Drawable.html#scale" target="_self">scale</a>, <a href="../../graphyx/graphics/Drawable.html#windowHeight" target="_self">windowHeight</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalDistanceJoint.html#draw%28%29" target="_self">draw</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Stellt das graphische Objekt dar.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalDistanceJoint.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalDistanceJoint.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalDistanceJoint.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalDistanceJoint.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalDistanceJoint.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalDistanceJoint.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/Drawable.html#correctY%28Double%29" target="_self">correctY</a>, <a href="../../graphyx/graphics/Drawable.html#drawLine%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawLine</a>, <a href="../../graphyx/graphics/Drawable.html#fillPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">fillPolygon</a>, <a href="../../graphyx/graphics/Drawable.html#drawPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">drawPolygon</a>, <a href="../../graphyx/graphics/Drawable.html#fillCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">fillCircle</a>, <a href="../../graphyx/graphics/Drawable.html#drawCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">drawCircle</a>, <a href="../../graphyx/graphics/Drawable.html#drawPoint%28sims.geometry.Vector2D%29" target="_self">drawPoint</a>, <a href="../../graphyx/graphics/Drawable.html#drawVector%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawVector</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>GraphicalDistanceJoint</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GraphicalDistanceJoint</span><span class="params">(<span name="real">real: <a href="../../sims/dynamics/joints/DistanceJoint.html" class="extype" name="sims.dynamics.joints.DistanceJoint">DistanceJoint</a></span>)</span><span class="result"> extends <a href="GraphicalJoint.html" class="extype" name="graphyx.graphics.GraphicalJoint">GraphicalJoint</a> with <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="connection1"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>connection1</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="connection2"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>connection2</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="draw%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>draw</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Stellt das graphische Objekt dar.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="graphyx.graphics.GraphicalJoint">GraphicalJoint</li><li class="in" name="graphyx.graphics.GraphicalObject">GraphicalObject</li><li class="in" name="graphyx.graphics.Drawable">Drawable</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.graphics.GraphicalDistanceJoint#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalDistanceJoint#connection1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">connection1</span><span class="result">: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalDistanceJoint#connection2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">connection2</span><span class="result">: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Drawable#correctY">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctY</span><span class="params">(<span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent</p><div class="fullcomment">
+      <div class="comment cmt"><p>Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent.</p></div>
+      <dl class="paramcmts block"><dt class="param">y</dt><dd class="cmt"><p>zu korrigierender Wert</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalDistanceJoint#draw">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">draw</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Stellt das graphische Objekt dar</p><div class="fullcomment">
+      <div class="comment cmt"><p>Stellt das graphische Objekt dar.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawLine">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawLine</span><span class="params">(<span name="startPoint">startPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="endPoint">endPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt eine Linie auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt eine Linie auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">startPoint</dt><dd class="cmt"><p>Startpunkt in Weltkoordinaten</p></dd><dt class="param">endPoint</dt><dd class="cmt"><p>Endpunkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPoint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPoint</span><span class="params">(<span name="point">point: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Punkt auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Punkt auf <code>g</code>.
+<p>
+Der Punkt wird von einem Kreis umgeben.</p></div>
+      <dl class="paramcmts block"><dt class="param">point</dt><dd class="cmt"><p>Punkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawVector">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawVector</span><span class="params">(<span name="v">v: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="p">p: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Vektor auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Vektor auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">v</dt><dd class="cmt"><p>Vektor in Weltkoordinaten</p></dd><dt class="param">p</dt><dd class="cmt"><p>Ursprungspunkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalDistanceJoint#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen massiven Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen massiven Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein massives Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein massives Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#g">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">g</span><span class="result">: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Java Graphics Objekt zur graphischen Darstellung</p><div class="fullcomment">
+      <div class="comment cmt"><p>Java Graphics Objekt zur graphischen Darstellung</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalDistanceJoint#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#ppm">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">ppm</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Anzahl von Pixeln pro Meter</p><div class="fullcomment">
+      <div class="comment cmt"><p>Anzahl von Pixeln pro Meter.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalDistanceJoint#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalDistanceJoint#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalDistanceJoint#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalDistanceJoint#real">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">real</span><span class="result">: <a href="../../sims/dynamics/joints/DistanceJoint.html" class="extype" name="sims.dynamics.joints.DistanceJoint">DistanceJoint</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Pointer to real object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Pointer to real object.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#scale">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">scale</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Skala in der die graphischen Objekte gezeichnet werden</p><div class="fullcomment">
+      <div class="comment cmt"><p>Skala in der die graphischen Objekte gezeichnet werden.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalDistanceJoint#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#windowHeight">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">windowHeight</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Hoehe des Fensters in Pixeln</p><div class="fullcomment">
+      <div class="comment cmt"><p>Hoehe des Fensters in Pixeln.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.graphics.GraphicalDistanceJoint#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GraphicalDistanceJoint</span><span class="params">(<span name="real">real: <a href="../../sims/dynamics/joints/DistanceJoint.html" class="extype" name="sims.dynamics.joints.DistanceJoint">DistanceJoint</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GraphicalDistanceJoint</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/GraphicalJoint.html b/doc/graphyx/graphics/GraphicalJoint.html
index 69c1c32..58afee3 100644
--- a/doc/graphyx/graphics/GraphicalJoint.html
+++ b/doc/graphyx/graphics/GraphicalJoint.html
@@ -1,132 +1,378 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>trait GraphicalJoint in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.graphics.GraphicalJoint</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">trait  GraphicalJoint</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/GraphicalJoint"><code>graphyx/graphics/GraphicalJoint.scala</code></a>]
-      </div><hr></hr>
-      <a name="GraphicalJoint"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>trait</code>
-        <em>GraphicalJoint</em>
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/graphics/GraphicalObject.html" target="_self">GraphicalObject</a></dd>
-    </dl><dl>
-      <dt style="margin:10px 0 0 20px;"><b>Direct Known Subclasses:</b></dt>
-      <dd><a href="../../graphyx/graphics/GraphicalDistanceJoint.html" target="_self">GraphicalDistanceJoint</a>, <a href="../../graphyx/graphics/GraphicalRevoluteJoint.html" target="_self">GraphicalRevoluteJoint</a>, <a href="../../graphyx/graphics/GraphicalSpringJoint.html" target="_self">GraphicalSpringJoint</a></dd>
-      </dl><hr></hr>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">graphics</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalJoint.html#real" target="_self">real</a></em>
-         : <a href="../../sims/dynamics/joints/Joint.html" target="_self">Joint</a>
-        
-        <div>Pointer to real object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/Drawable.html#g" target="_self">g</a>, <a href="../../graphyx/graphics/Drawable.html#ppm" target="_self">ppm</a>, <a href="../../graphyx/graphics/Drawable.html#scale" target="_self">scale</a>, <a href="../../graphyx/graphics/Drawable.html#windowHeight" target="_self">windowHeight</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/Drawable.html#correctY%28Double%29" target="_self">correctY</a>, <a href="../../graphyx/graphics/Drawable.html#drawLine%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawLine</a>, <a href="../../graphyx/graphics/Drawable.html#fillPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">fillPolygon</a>, <a href="../../graphyx/graphics/Drawable.html#drawPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">drawPolygon</a>, <a href="../../graphyx/graphics/Drawable.html#fillCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">fillCircle</a>, <a href="../../graphyx/graphics/Drawable.html#drawCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">drawCircle</a>, <a href="../../graphyx/graphics/Drawable.html#drawPoint%28sims.geometry.Vector2D%29" target="_self">drawPoint</a>, <a href="../../graphyx/graphics/Drawable.html#drawVector%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawVector</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/graphics/GraphicalObject.html" target="_self">GraphicalObject</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/GraphicalObject.html#draw%28%29" target="_self">draw</a> (abstract)
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/trait_big.png" />
+        <h1>GraphicalJoint</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">trait</span>
+      <span class="symbol">
+        <span class="name">GraphicalJoint</span><span class="result"> extends <a href="GraphicalObject.html" class="extype" name="graphyx.graphics.GraphicalObject">GraphicalObject</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="real"></a><dl>
-      <dt>
+      
+      
+      
+      <div class="block">
+                known subclasses: <a href="GraphicalSpringJoint.html">GraphicalSpringJoint</a>, <a href="GraphicalRevoluteJoint.html">GraphicalRevoluteJoint</a>, <a href="GraphicalDistanceJoint.html">GraphicalDistanceJoint</a>
+              </div>
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.graphics.GraphicalObject">GraphicalObject</li><li class="in" name="graphyx.graphics.Drawable">Drawable</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code>abstract</code>
-        <code>val</code>
-        <em>real</em> : <a href="../../sims/dynamics/joints/Joint.html" target="_self">Joint</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Pointer to real object.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/graphics/GraphicalObject.html" target="_self">GraphicalObject</a>.<a href="../../graphyx/graphics/GraphicalObject.html#real" target="_self">real</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.graphics.Drawable#correctY">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctY</span><span class="params">(<span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent</p><div class="fullcomment">
+      <div class="comment cmt"><p>Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent.</p></div>
+      <dl class="paramcmts block"><dt class="param">y</dt><dd class="cmt"><p>zu korrigierender Wert</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalObject#draw">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">draw</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Stellt das graphische Objekt dar</p><div class="fullcomment">
+      <div class="comment cmt"><p>Stellt das graphische Objekt dar.</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      <div class="block">
+            definition classes: <a href="GraphicalObject.html">GraphicalObject</a> ⇐ <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawLine">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawLine</span><span class="params">(<span name="startPoint">startPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="endPoint">endPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt eine Linie auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt eine Linie auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">startPoint</dt><dd class="cmt"><p>Startpunkt in Weltkoordinaten</p></dd><dt class="param">endPoint</dt><dd class="cmt"><p>Endpunkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPoint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPoint</span><span class="params">(<span name="point">point: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Punkt auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Punkt auf <code>g</code>.
+<p>
+Der Punkt wird von einem Kreis umgeben.</p></div>
+      <dl class="paramcmts block"><dt class="param">point</dt><dd class="cmt"><p>Punkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawVector">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawVector</span><span class="params">(<span name="v">v: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="p">p: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Vektor auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Vektor auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">v</dt><dd class="cmt"><p>Vektor in Weltkoordinaten</p></dd><dt class="param">p</dt><dd class="cmt"><p>Ursprungspunkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen massiven Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen massiven Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein massives Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein massives Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#g">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">g</span><span class="result">: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Java Graphics Objekt zur graphischen Darstellung</p><div class="fullcomment">
+      <div class="comment cmt"><p>Java Graphics Objekt zur graphischen Darstellung</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#ppm">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">ppm</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Anzahl von Pixeln pro Meter</p><div class="fullcomment">
+      <div class="comment cmt"><p>Anzahl von Pixeln pro Meter.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalJoint#real">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">real</span><span class="result">: <a href="../../sims/dynamics/joints/Joint.html" class="extype" name="sims.dynamics.joints.Joint">Joint</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Pointer to real object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Pointer to real object.</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#scale">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">scale</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Skala in der die graphischen Objekte gezeichnet werden</p><div class="fullcomment">
+      <div class="comment cmt"><p>Skala in der die graphischen Objekte gezeichnet werden.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#windowHeight">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">windowHeight</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Hoehe des Fensters in Pixeln</p><div class="fullcomment">
+      <div class="comment cmt"><p>Hoehe des Fensters in Pixeln.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/GraphicalObject.html b/doc/graphyx/graphics/GraphicalObject.html
index 4add644..c99d087 100644
--- a/doc/graphyx/graphics/GraphicalObject.html
+++ b/doc/graphyx/graphics/GraphicalObject.html
@@ -1,154 +1,376 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>trait GraphicalObject in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.graphics.GraphicalObject</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">trait  GraphicalObject</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/GraphicalObject"><code>graphyx/graphics/GraphicalObject.scala</code></a>]
-      </div><hr></hr>
-      <a name="GraphicalObject"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>trait</code>
-        <em>GraphicalObject</em>
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a></dd>
-    </dl>
-      <dl><dd>Only copies functional info! (e.g. Graphical world does not include shapes, bodies).</dd></dl>
-      <dl></dl>
-    <dl>
-      <dt style="margin:10px 0 0 20px;"><b>Direct Known Subclasses:</b></dt>
-      <dd><a href="../../graphyx/graphics/GraphicalAABB.html" target="_self">GraphicalAABB</a>, <a href="../../graphyx/graphics/GraphicalBody.html" target="_self">GraphicalBody</a>, <a href="../../graphyx/graphics/GraphicalCollision.html" target="_self">GraphicalCollision</a>, <a href="../../graphyx/graphics/GraphicalJoint.html" target="_self">GraphicalJoint</a>, <a href="../../graphyx/graphics/GraphicalPair.html" target="_self">GraphicalPair</a>, <a href="../../graphyx/graphics/GraphicalShape.html" target="_self">GraphicalShape</a></dd>
-      </dl><hr></hr>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">graphics</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalObject.html#real" target="_self">real</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
+      <div id="definition">
+        <img src="../../lib/trait_big.png" />
+        <h1>GraphicalObject</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">trait</span>
+      <span class="symbol">
+        <span class="name">GraphicalObject</span><span class="result"> extends <a href="Drawable.html" class="extype" name="graphyx.graphics.Drawable">Drawable</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>Only copies functional info! (e.g. Graphical world does not include shapes, bodies).</p></div>
+      
+      
+      
+      <div class="block">
+                known subclasses: <a href="GraphicalJoint.html">GraphicalJoint</a>, <a href="GraphicalShape.html">GraphicalShape</a>, <a href="GraphicalPair.html">GraphicalPair</a>, <a href="GraphicalCollision.html">GraphicalCollision</a>, <a href="GraphicalBody.html">GraphicalBody</a>, <a href="GraphicalAABB.html">GraphicalAABB</a>
+              </div>
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.graphics.Drawable">Drawable</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <div>Pointer to real object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/Drawable.html#g" target="_self">g</a>, <a href="../../graphyx/graphics/Drawable.html#ppm" target="_self">ppm</a>, <a href="../../graphyx/graphics/Drawable.html#scale" target="_self">scale</a>, <a href="../../graphyx/graphics/Drawable.html#windowHeight" target="_self">windowHeight</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalObject.html#draw%28%29" target="_self">draw</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
         
-        <div>Stellt das graphische Objekt dar.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/Drawable.html#correctY%28Double%29" target="_self">correctY</a>, <a href="../../graphyx/graphics/Drawable.html#drawLine%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawLine</a>, <a href="../../graphyx/graphics/Drawable.html#fillPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">fillPolygon</a>, <a href="../../graphyx/graphics/Drawable.html#drawPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">drawPolygon</a>, <a href="../../graphyx/graphics/Drawable.html#fillCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">fillCircle</a>, <a href="../../graphyx/graphics/Drawable.html#drawCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">drawCircle</a>, <a href="../../graphyx/graphics/Drawable.html#drawPoint%28sims.geometry.Vector2D%29" target="_self">drawPoint</a>, <a href="../../graphyx/graphics/Drawable.html#drawVector%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawVector</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.graphics.Drawable#correctY">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctY</span><span class="params">(<span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent</p><div class="fullcomment">
+      <div class="comment cmt"><p>Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent.</p></div>
+      <dl class="paramcmts block"><dt class="param">y</dt><dd class="cmt"><p>zu korrigierender Wert</p></dd></dl>
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="real"></a><dl>
-      <dt>
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalObject#draw">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">draw</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Stellt das graphische Objekt dar</p><div class="fullcomment">
+      <div class="comment cmt"><p>Stellt das graphische Objekt dar.</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawLine">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawLine</span><span class="params">(<span name="startPoint">startPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="endPoint">endPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt eine Linie auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt eine Linie auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">startPoint</dt><dd class="cmt"><p>Startpunkt in Weltkoordinaten</p></dd><dt class="param">endPoint</dt><dd class="cmt"><p>Endpunkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPoint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPoint</span><span class="params">(<span name="point">point: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Punkt auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Punkt auf <code>g</code>.
+<p>
+Der Punkt wird von einem Kreis umgeben.</p></div>
+      <dl class="paramcmts block"><dt class="param">point</dt><dd class="cmt"><p>Punkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawVector">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawVector</span><span class="params">(<span name="v">v: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="p">p: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Vektor auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Vektor auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">v</dt><dd class="cmt"><p>Vektor in Weltkoordinaten</p></dd><dt class="param">p</dt><dd class="cmt"><p>Ursprungspunkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen massiven Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen massiven Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein massives Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein massives Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#g">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">g</span><span class="result">: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Java Graphics Objekt zur graphischen Darstellung</p><div class="fullcomment">
+      <div class="comment cmt"><p>Java Graphics Objekt zur graphischen Darstellung</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#ppm">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">ppm</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Anzahl von Pixeln pro Meter</p><div class="fullcomment">
+      <div class="comment cmt"><p>Anzahl von Pixeln pro Meter.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalObject#real">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">real</span><span class="result">: AnyRef</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Pointer to real object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Pointer to real object.</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#scale">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">scale</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Skala in der die graphischen Objekte gezeichnet werden</p><div class="fullcomment">
+      <div class="comment cmt"><p>Skala in der die graphischen Objekte gezeichnet werden.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#windowHeight">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">windowHeight</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Hoehe des Fensters in Pixeln</p><div class="fullcomment">
+      <div class="comment cmt"><p>Hoehe des Fensters in Pixeln.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code>abstract</code>
-        <code>val</code>
-        <em>real</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Pointer to real object.</dd></dl>
-      <dl></dl>
-    <hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="draw%28%29"></a><dl>
-      <dt>
         
-        <code>abstract</code>
-        <code>def</code>
-        <em>draw</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Stellt das graphische Objekt dar.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>.<a href="../../graphyx/graphics/Drawable.html#draw%28%29" target="_self">draw</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+        
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/GraphicalPair$object.html b/doc/graphyx/graphics/GraphicalPair$object.html
deleted file mode 100644
index 7b37b60..0000000
--- a/doc/graphyx/graphics/GraphicalPair$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object GraphicalPair in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">object  GraphicalPair</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/GraphicalPair"><code>graphyx/graphics/GraphicalPair.scala</code></a>]
-      </div><hr></hr>
-      <a name="GraphicalPair"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>GraphicalPair</em>
-      </dt>
-      <dd><code> extends </code>(<a href="../../sims/collision/Pair.html" target="_self">Pair</a>) =&gt; <a href="../../graphyx/graphics/GraphicalPair.html" target="_self">GraphicalPair</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function1">scala.Function1</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function1">scala.Function1.toString</a>, <a href="#compose" target="contentFrame" class="scala/Function1">scala.Function1.compose</a>, <a href="#andThen" target="contentFrame" class="scala/Function1">scala.Function1.andThen</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/GraphicalPair.html b/doc/graphyx/graphics/GraphicalPair.html
index 27ad098..637de0b 100644
--- a/doc/graphyx/graphics/GraphicalPair.html
+++ b/doc/graphyx/graphics/GraphicalPair.html
@@ -1,363 +1,447 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class GraphicalPair in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.graphics.GraphicalPair</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">class  GraphicalPair</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/GraphicalPair"><code>graphyx/graphics/GraphicalPair.scala</code></a>]
-      </div><hr></hr>
-      <a name="GraphicalPair"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>GraphicalPair</em>(<code>val </code><em>real</em> : <a href="../../sims/collision/Pair.html" target="_self">Pair</a>)
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/graphics/GraphicalObject.html" target="_self">GraphicalObject</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">graphics</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalPair.html#pos1" target="_self">pos1</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalPair.html#pos2" target="_self">pos2</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/Drawable.html#g" target="_self">g</a>, <a href="../../graphyx/graphics/Drawable.html#ppm" target="_self">ppm</a>, <a href="../../graphyx/graphics/Drawable.html#scale" target="_self">scale</a>, <a href="../../graphyx/graphics/Drawable.html#windowHeight" target="_self">windowHeight</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalPair.html#draw%28%29" target="_self">draw</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Stellt das graphische Objekt dar.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalPair.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalPair.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalPair.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalPair.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalPair.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalPair.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/Drawable.html#correctY%28Double%29" target="_self">correctY</a>, <a href="../../graphyx/graphics/Drawable.html#drawLine%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawLine</a>, <a href="../../graphyx/graphics/Drawable.html#fillPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">fillPolygon</a>, <a href="../../graphyx/graphics/Drawable.html#drawPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">drawPolygon</a>, <a href="../../graphyx/graphics/Drawable.html#fillCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">fillCircle</a>, <a href="../../graphyx/graphics/Drawable.html#drawCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">drawCircle</a>, <a href="../../graphyx/graphics/Drawable.html#drawPoint%28sims.geometry.Vector2D%29" target="_self">drawPoint</a>, <a href="../../graphyx/graphics/Drawable.html#drawVector%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawVector</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>GraphicalPair</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GraphicalPair</span><span class="params">(<span name="real">real: <a href="../../sims/collision/Pair.html" class="extype" name="sims.collision.Pair">Pair</a></span>)</span><span class="result"> extends <a href="GraphicalObject.html" class="extype" name="graphyx.graphics.GraphicalObject">GraphicalObject</a> with <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="pos1"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>pos1</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="pos2"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>pos2</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="draw%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>draw</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Stellt das graphische Objekt dar.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/graphics/GraphicalObject.html" target="_self">GraphicalObject</a>.<a href="../../graphyx/graphics/GraphicalObject.html#draw%28%29" target="_self">draw</a>
-        </dd>
-      </dl><hr></hr>
-<a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="graphyx.graphics.GraphicalObject">GraphicalObject</li><li class="in" name="graphyx.graphics.Drawable">Drawable</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.graphics.GraphicalPair#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Drawable#correctY">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctY</span><span class="params">(<span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent</p><div class="fullcomment">
+      <div class="comment cmt"><p>Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent.</p></div>
+      <dl class="paramcmts block"><dt class="param">y</dt><dd class="cmt"><p>zu korrigierender Wert</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalPair#draw">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">draw</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Stellt das graphische Objekt dar</p><div class="fullcomment">
+      <div class="comment cmt"><p>Stellt das graphische Objekt dar.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawLine">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawLine</span><span class="params">(<span name="startPoint">startPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="endPoint">endPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt eine Linie auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt eine Linie auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">startPoint</dt><dd class="cmt"><p>Startpunkt in Weltkoordinaten</p></dd><dt class="param">endPoint</dt><dd class="cmt"><p>Endpunkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPoint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPoint</span><span class="params">(<span name="point">point: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Punkt auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Punkt auf <code>g</code>.
+<p>
+Der Punkt wird von einem Kreis umgeben.</p></div>
+      <dl class="paramcmts block"><dt class="param">point</dt><dd class="cmt"><p>Punkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawVector">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawVector</span><span class="params">(<span name="v">v: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="p">p: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Vektor auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Vektor auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">v</dt><dd class="cmt"><p>Vektor in Weltkoordinaten</p></dd><dt class="param">p</dt><dd class="cmt"><p>Ursprungspunkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalPair#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen massiven Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen massiven Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein massives Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein massives Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#g">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">g</span><span class="result">: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Java Graphics Objekt zur graphischen Darstellung</p><div class="fullcomment">
+      <div class="comment cmt"><p>Java Graphics Objekt zur graphischen Darstellung</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalPair#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalPair#pos1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">pos1</span><span class="result">: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalPair#pos2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">pos2</span><span class="result">: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Drawable#ppm">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">ppm</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Anzahl von Pixeln pro Meter</p><div class="fullcomment">
+      <div class="comment cmt"><p>Anzahl von Pixeln pro Meter.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalPair#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalPair#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalPair#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalPair#real">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">real</span><span class="result">: <a href="../../sims/collision/Pair.html" class="extype" name="sims.collision.Pair">Pair</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Pointer to real object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Pointer to real object.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#scale">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">scale</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Skala in der die graphischen Objekte gezeichnet werden</p><div class="fullcomment">
+      <div class="comment cmt"><p>Skala in der die graphischen Objekte gezeichnet werden.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalPair#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#windowHeight">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">windowHeight</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Hoehe des Fensters in Pixeln</p><div class="fullcomment">
+      <div class="comment cmt"><p>Hoehe des Fensters in Pixeln.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.graphics.GraphicalPair#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GraphicalPair</span><span class="params">(<span name="real">real: <a href="../../sims/collision/Pair.html" class="extype" name="sims.collision.Pair">Pair</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GraphicalPair</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/GraphicalRectangle$object.html b/doc/graphyx/graphics/GraphicalRectangle$object.html
deleted file mode 100644
index cb18cac..0000000
--- a/doc/graphyx/graphics/GraphicalRectangle$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object GraphicalRectangle in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">object  GraphicalRectangle</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/GraphicalRectangle"><code>graphyx/graphics/GraphicalRectangle.scala</code></a>]
-      </div><hr></hr>
-      <a name="GraphicalRectangle"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>GraphicalRectangle</em>
-      </dt>
-      <dd><code> extends </code>(<a href="../../sims/dynamics/Rectangle.html" target="_self">Rectangle</a>) =&gt; <a href="../../graphyx/graphics/GraphicalRectangle.html" target="_self">GraphicalRectangle</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function1">scala.Function1</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function1">scala.Function1.toString</a>, <a href="#compose" target="contentFrame" class="scala/Function1">scala.Function1.compose</a>, <a href="#andThen" target="contentFrame" class="scala/Function1">scala.Function1.andThen</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/GraphicalRectangle.html b/doc/graphyx/graphics/GraphicalRectangle.html
index 27d2809..5202e32 100644
--- a/doc/graphyx/graphics/GraphicalRectangle.html
+++ b/doc/graphyx/graphics/GraphicalRectangle.html
@@ -1,376 +1,836 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class GraphicalRectangle in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.graphics.GraphicalRectangle</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">class  GraphicalRectangle</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/GraphicalRectangle"><code>graphyx/graphics/GraphicalRectangle.scala</code></a>]
-      </div><hr></hr>
-      <a name="GraphicalRectangle"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>GraphicalRectangle</em>(<code>val </code><em>real</em> : <a href="../../sims/dynamics/Rectangle.html" target="_self">Rectangle</a>)
-      </dt>
-      <dd><code> extends </code><a href="../../sims/dynamics/Rectangle.html" target="_self">Rectangle</a><code> with </code><a href="../../graphyx/graphics/GraphicalShape.html" target="_self">GraphicalShape</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">graphics</a></p>
 
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../graphyx/graphics/GraphicalShape.html" target="_self">GraphicalShape</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/GraphicalShape.html#uid" target="_self">uid</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/Drawable.html#g" target="_self">g</a>, <a href="../../graphyx/graphics/Drawable.html#ppm" target="_self">ppm</a>, <a href="../../graphyx/graphics/Drawable.html#scale" target="_self">scale</a>, <a href="../../graphyx/graphics/Drawable.html#windowHeight" target="_self">windowHeight</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../sims/dynamics/Rectangle.html" target="_self">Rectangle</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/dynamics/Rectangle.html#halfWidth" target="_self">halfWidth</a>, <a href="../../sims/dynamics/Rectangle.html#halfHeight" target="_self">halfHeight</a>, <a href="../../sims/dynamics/Rectangle.html#density" target="_self">density</a>, <a href="../../sims/dynamics/Rectangle.html#volume" target="_self">volume</a>, <a href="../../sims/dynamics/Rectangle.html#I" target="_self">I</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/dynamics/Shape.html#collidable" target="_self">collidable</a>, <a href="../../sims/dynamics/Shape.html#restitution" target="_self">restitution</a>, <a href="../../sims/dynamics/Shape.html#friction" target="_self">friction</a>, <a href="../../sims/dynamics/Shape.html#pos" target="_self">pos</a>, <a href="../../sims/dynamics/Shape.html#rotation" target="_self">rotation</a>, <a href="../../sims/dynamics/Shape.html#rotation0" target="_self">rotation0</a>, <a href="../../sims/dynamics/Shape.html#refLocalPos" target="_self">refLocalPos</a>, <a href="../../sims/dynamics/Shape.html#transientShapes" target="_self">transientShapes</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalRectangle.html#draw%28%29" target="_self">draw</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Stellt das graphische Objekt dar.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalRectangle.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalRectangle.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalRectangle.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalRectangle.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalRectangle.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalRectangle.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/Drawable.html#correctY%28Double%29" target="_self">correctY</a>, <a href="../../graphyx/graphics/Drawable.html#drawLine%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawLine</a>, <a href="../../graphyx/graphics/Drawable.html#fillPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">fillPolygon</a>, <a href="../../graphyx/graphics/Drawable.html#drawPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">drawPolygon</a>, <a href="../../graphyx/graphics/Drawable.html#fillCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">fillCircle</a>, <a href="../../graphyx/graphics/Drawable.html#drawCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">drawCircle</a>, <a href="../../graphyx/graphics/Drawable.html#drawPoint%28sims.geometry.Vector2D%29" target="_self">drawPoint</a>, <a href="../../graphyx/graphics/Drawable.html#drawVector%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawVector</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../sims/dynamics/Rectangle.html" target="_self">Rectangle</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/dynamics/Rectangle.html#halfDiags" target="_self">halfDiags</a>, <a href="../../sims/dynamics/Rectangle.html#vertices" target="_self">vertices</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/geometry/ConvexPolygon.html#sides" target="_self">sides</a>, <a href="../../sims/geometry/ConvexPolygon.html#project%28sims.geometry.Vector2D%29" target="_self">project</a>, <a href="../../sims/geometry/ConvexPolygon.html#AABB" target="_self">AABB</a>, <a href="../../sims/geometry/ConvexPolygon.html#contains%28sims.geometry.Vector2D%29" target="_self">contains</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/dynamics/Shape.html#mass" target="_self">mass</a>, <a href="../../sims/dynamics/Shape.html#body" target="_self">body</a>, <a href="../../sims/dynamics/Shape.html#asBody" target="_self">asBody</a>, <a href="../../sims/dynamics/Shape.html#%7E%28sims.dynamics.Shape%29" target="_self">~</a>, <a href="../../sims/dynamics/Shape.html#%7E%28sims.dynamics.Body%29" target="_self">~</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>GraphicalRectangle</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GraphicalRectangle</span><span class="params">(<span name="real">real: <a href="../../sims/dynamics/Rectangle.html" class="extype" name="sims.dynamics.Rectangle">Rectangle</a></span>)</span><span class="result"> extends <a href="../../sims/dynamics/Rectangle.html" class="extype" name="sims.dynamics.Rectangle">Rectangle</a> with <a href="GraphicalShape.html" class="extype" name="graphyx.graphics.GraphicalShape">GraphicalShape</a> with <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="draw%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>draw</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Stellt das graphische Objekt dar.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/Rectangle.html" target="_self">Rectangle</a>.<a href="../../sims/dynamics/Rectangle.html#hashCode%28%29" target="_self">hashCode</a>
-        </dd>
-      </dl><hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.graphics.GraphicalShape">GraphicalShape</li><li class="in" name="graphyx.graphics.GraphicalObject">GraphicalObject</li><li class="in" name="graphyx.graphics.Drawable">Drawable</li><li class="in" name="sims.dynamics.Rectangle">Rectangle</li><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="sims.geometry.ConvexPolygon">ConvexPolygon</li><li class="in" name="sims.dynamics.Shape">Shape</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/Rectangle.html" target="_self">Rectangle</a>.<a href="../../sims/dynamics/Rectangle.html#toString%28%29" target="_self">toString</a>
-        </dd>
-      </dl><hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/Rectangle.html" target="_self">Rectangle</a>.<a href="../../sims/dynamics/Rectangle.html#equals%28Any%29" target="_self">equals</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/Rectangle.html" target="_self">Rectangle</a>.<a href="../../sims/dynamics/Rectangle.html#productPrefix" target="_self">productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.geometry.ConvexPolygon#AABB">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">AABB</span><span class="result">: <a href="../../sims/collision/AABB.html" class="extype" name="sims.collision.AABB">AABB</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns this polygon's axis aligned bounding box</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns this polygon's axis aligned bounding box.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/geometry/ConvexPolygon.html">ConvexPolygon</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Rectangle#I">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">I</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Moment of inertia for a rotation about this shape's COM</p><div class="fullcomment">
+      <div class="comment cmt"><p>Moment of inertia for a rotation about this shape's COM.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Rectangle.html">Rectangle</a> ⇐ <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#asBody">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">asBody</span><span class="result">: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Creates a new body made out of tis shape</p><div class="fullcomment">
+      <div class="comment cmt"><p>Creates a new body made out of tis shape.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#body">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">body</span><span class="result">: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns this shape's containing body</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns this shape's containing body.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalRectangle#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Shape#collidable">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">collidable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Flag determining this shapes ability to collide with other shapes</p><div class="fullcomment">
+      <div class="comment cmt"><p>Flag determining this shapes ability to collide with other shapes.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.geometry.ConvexPolygon#contains">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">contains</span><span class="params">(<span name="point">point: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Checks if the point <code>point</code> is contained in this polygon</p><div class="fullcomment">
+      <div class="comment cmt"><p>Checks if the point <code>point</code> is contained in this polygon.
+<p>
+A ray is created, originating from the point and following an arbitrary direction (X-Axis was chosen).
+The number of intersections between the ray and this polygon's sides (including vertices) is counted.
+The amount of intersections with vertices is substracted form the previuos number.
+If the latter number is odd, the point is contained in the polygon.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/geometry/ConvexPolygon.html">ConvexPolygon</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#correctY">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctY</span><span class="params">(<span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent</p><div class="fullcomment">
+      <div class="comment cmt"><p>Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent.</p></div>
+      <dl class="paramcmts block"><dt class="param">y</dt><dd class="cmt"><p>zu korrigierender Wert</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Rectangle#density">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">density</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Density</p><div class="fullcomment">
+      <div class="comment cmt"><p>Density. (Mass per area)</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Rectangle.html">Rectangle</a> ⇐ <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalRectangle#draw">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">draw</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Stellt das graphische Objekt dar</p><div class="fullcomment">
+      <div class="comment cmt"><p>Stellt das graphische Objekt dar.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawLine">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawLine</span><span class="params">(<span name="startPoint">startPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="endPoint">endPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt eine Linie auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt eine Linie auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">startPoint</dt><dd class="cmt"><p>Startpunkt in Weltkoordinaten</p></dd><dt class="param">endPoint</dt><dd class="cmt"><p>Endpunkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPoint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPoint</span><span class="params">(<span name="point">point: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Punkt auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Punkt auf <code>g</code>.
+<p>
+Der Punkt wird von einem Kreis umgeben.</p></div>
+      <dl class="paramcmts block"><dt class="param">point</dt><dd class="cmt"><p>Punkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawVector">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawVector</span><span class="params">(<span name="v">v: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="p">p: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Vektor auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Vektor auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">v</dt><dd class="cmt"><p>Vektor in Weltkoordinaten</p></dd><dt class="param">p</dt><dd class="cmt"><p>Ursprungspunkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalRectangle#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen massiven Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen massiven Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein massives Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein massives Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#friction">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">friction</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Part of the coefficient of friction for a collision between this shape and another</p><div class="fullcomment">
+      <div class="comment cmt"><p>Part of the coefficient of friction for a collision between this shape and another.
+The coefficient of friction is calculated out of the product of this part and the other shape's part.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#g">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">g</span><span class="result">: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Java Graphics Objekt zur graphischen Darstellung</p><div class="fullcomment">
+      <div class="comment cmt"><p>Java Graphics Objekt zur graphischen Darstellung</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Rectangle#halfDiags">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">halfDiags</span><span class="result">: <span class="extype" name="scala.Array">Array</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the vectors from the center to the vertices of this rectangle</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the vectors from the center to the vertices of this rectangle.
+The first vertex is the upper-right vertex at a rotation of 0.
+Vertices are ordered counter-clockwise.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Rectangle.html">Rectangle</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Rectangle#halfHeight">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">halfHeight</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Rectangle#halfWidth">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">halfWidth</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalRectangle#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#mass">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">mass</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the mass of this shape</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the mass of this shape. The mass is given by volume times density.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#pos">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">pos</span><span class="result">: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Position of this shape's COM (in world coordinates)</p><div class="fullcomment">
+      <div class="comment cmt"><p>Position of this shape's COM (in world coordinates).</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#ppm">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">ppm</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Anzahl von Pixeln pro Meter</p><div class="fullcomment">
+      <div class="comment cmt"><p>Anzahl von Pixeln pro Meter.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalRectangle#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalRectangle#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalRectangle#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.ConvexPolygon#project">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">project</span><span class="params">(<span name="axis">axis: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <a href="../../sims/geometry/Projection.html" class="extype" name="sims.geometry.Projection">Projection</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the projection of this polygon onto the line given by the directional vector <code>axis</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the projection of this polygon onto the line given by the directional vector <code>axis</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">axis</dt><dd class="cmt"><p>directional vector of the line</p></dd><dt>returns</dt><dd class="cmt"><p>projection of this polygon</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="../../sims/geometry/ConvexPolygon.html">ConvexPolygon</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalRectangle#real">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">real</span><span class="result">: <a href="../../sims/dynamics/Rectangle.html" class="extype" name="sims.dynamics.Rectangle">Rectangle</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Pointer to real object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Pointer to real object.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#refLocalPos">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">refLocalPos</span><span class="result">: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Local position of this shape's body COM to its COM at a body rotation of zero</p><div class="fullcomment">
+      <div class="comment cmt"><p>Local position of this shape's body COM to its COM at a body rotation of zero.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#restitution">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">restitution</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Part of the coefficient of restitution for a collision between this shape and another</p><div class="fullcomment">
+      <div class="comment cmt"><p>Part of the coefficient of restitution for a collision between this shape and another.
+The coefficient of restitution is calculated out of the product of this part and the other shape's part.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#rotation">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">rotation</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Rotation of this shape about its COM</p><div class="fullcomment">
+      <div class="comment cmt"><p>Rotation of this shape about its COM.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#rotation0">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">rotation0</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Initial rotation</p><div class="fullcomment">
+      <div class="comment cmt"><p>Initial rotation. Rotation of this shape before it was added to a body.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#scale">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">scale</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Skala in der die graphischen Objekte gezeichnet werden</p><div class="fullcomment">
+      <div class="comment cmt"><p>Skala in der die graphischen Objekte gezeichnet werden.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.geometry.ConvexPolygon#sides">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">sides</span><span class="result">: <span class="extype" name="scala.Array">Array</span>[<a href="../../sims/geometry/Segment.html" class="extype" name="sims.geometry.Segment">Segment</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns all sides of this polygon</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns all sides of this polygon. The sides are ordered counter-clockwise, the first vertex of the side
+giving the side index.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/geometry/ConvexPolygon.html">ConvexPolygon</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalRectangle#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#transientShapes">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">transientShapes</span><span class="result">: <span class="extype" name="scala.collection.mutable.Set">Set</span>[<a href="../../sims/dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Shapes with which this shape cannot collide</p><div class="fullcomment">
+      <div class="comment cmt"><p>Shapes with which this shape cannot collide.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalShape#uid">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">uid</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Unique identification number</p><div class="fullcomment">
+      <div class="comment cmt"><p>Unique identification number.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="GraphicalShape.html">GraphicalShape</a> ⇐ <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Rectangle#vertices">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">vertices</span><span class="result">: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the position vectors of this rectangle's vertices</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the position vectors of this rectangle's vertices.
+The first vertex is the upper-right vertex at a rotation of 0.
+Vertices are ordered counter-clockwise.@return position vectors of the vertices</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Rectangle.html">Rectangle</a> ⇐ <a href="../../sims/geometry/ConvexPolygon.html">ConvexPolygon</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Rectangle#volume">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">volume</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Volume</p><div class="fullcomment">
+      <div class="comment cmt"><p>Volume. The volume is actually equivalent to this shape's area (SiMS is in 2D)
+and is used with this shape's density to calculate its mass.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Rectangle.html">Rectangle</a> ⇐ <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#windowHeight">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">windowHeight</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Hoehe des Fensters in Pixeln</p><div class="fullcomment">
+      <div class="comment cmt"><p>Hoehe des Fensters in Pixeln.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#~">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">~</span><span class="params">(<span name="b">b: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>)</span><span class="result">: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Creates a new body out of this shape and the shapes of body <code>b</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Creates a new body out of this shape and the shapes of body <code>b</code>.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#~">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">~</span><span class="params">(<span name="s">s: <a href="../../sims/dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>)</span><span class="result">: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Creates a new body out of this shape and the shape <code>s</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Creates a new body out of this shape and the shape <code>s</code>.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/Rectangle.html" target="_self">Rectangle</a>.<a href="../../sims/dynamics/Rectangle.html#productArity" target="_self">productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.graphics.GraphicalRectangle#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GraphicalRectangle</span><span class="params">(<span name="real">real: <a href="../../sims/dynamics/Rectangle.html" class="extype" name="sims.dynamics.Rectangle">Rectangle</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Rectangle#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GraphicalRectangle</span><span class="params">(<span name="halfWidth">halfWidth: <span class="extype" name="scala.Double">Double</span></span>, <span name="halfHeight">halfHeight: <span class="extype" name="scala.Double">Double</span></span>, <span name="density">density: <span class="extype" name="scala.Double">Double</span></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Shape#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GraphicalRectangle</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/Rectangle.html" target="_self">Rectangle</a>.<a href="../../sims/dynamics/Rectangle.html#productElement%28Int%29" target="_self">productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/GraphicalRegularPolygon$object.html b/doc/graphyx/graphics/GraphicalRegularPolygon$object.html
deleted file mode 100644
index 65d69bc..0000000
--- a/doc/graphyx/graphics/GraphicalRegularPolygon$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object GraphicalRegularPolygon in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">object  GraphicalRegularPolygon</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/GraphicalRegularPolygon"><code>graphyx/graphics/GraphicalRegularPolygon.scala</code></a>]
-      </div><hr></hr>
-      <a name="GraphicalRegularPolygon"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>GraphicalRegularPolygon</em>
-      </dt>
-      <dd><code> extends </code>(<a href="../../sims/dynamics/RegularPolygon.html" target="_self">RegularPolygon</a>) =&gt; <a href="../../graphyx/graphics/GraphicalRegularPolygon.html" target="_self">GraphicalRegularPolygon</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function1">scala.Function1</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function1">scala.Function1.toString</a>, <a href="#compose" target="contentFrame" class="scala/Function1">scala.Function1.compose</a>, <a href="#andThen" target="contentFrame" class="scala/Function1">scala.Function1.andThen</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/GraphicalRegularPolygon.html b/doc/graphyx/graphics/GraphicalRegularPolygon.html
index ee4a7aa..dc423c7 100644
--- a/doc/graphyx/graphics/GraphicalRegularPolygon.html
+++ b/doc/graphyx/graphics/GraphicalRegularPolygon.html
@@ -1,376 +1,824 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class GraphicalRegularPolygon in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.graphics.GraphicalRegularPolygon</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">class  GraphicalRegularPolygon</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/GraphicalRegularPolygon"><code>graphyx/graphics/GraphicalRegularPolygon.scala</code></a>]
-      </div><hr></hr>
-      <a name="GraphicalRegularPolygon"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>GraphicalRegularPolygon</em>(<code>val </code><em>real</em> : <a href="../../sims/dynamics/RegularPolygon.html" target="_self">RegularPolygon</a>)
-      </dt>
-      <dd><code> extends </code><a href="../../sims/dynamics/RegularPolygon.html" target="_self">RegularPolygon</a><code> with </code><a href="../../graphyx/graphics/GraphicalShape.html" target="_self">GraphicalShape</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">graphics</a></p>
 
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../graphyx/graphics/GraphicalShape.html" target="_self">GraphicalShape</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/GraphicalShape.html#uid" target="_self">uid</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/Drawable.html#g" target="_self">g</a>, <a href="../../graphyx/graphics/Drawable.html#ppm" target="_self">ppm</a>, <a href="../../graphyx/graphics/Drawable.html#scale" target="_self">scale</a>, <a href="../../graphyx/graphics/Drawable.html#windowHeight" target="_self">windowHeight</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../sims/dynamics/RegularPolygon.html" target="_self">RegularPolygon</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/dynamics/RegularPolygon.html#n" target="_self">n</a>, <a href="../../sims/dynamics/RegularPolygon.html#radius" target="_self">radius</a>, <a href="../../sims/dynamics/RegularPolygon.html#density" target="_self">density</a>, <a href="../../sims/dynamics/RegularPolygon.html#volume" target="_self">volume</a>, <a href="../../sims/dynamics/RegularPolygon.html#I" target="_self">I</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/dynamics/Shape.html#collidable" target="_self">collidable</a>, <a href="../../sims/dynamics/Shape.html#restitution" target="_self">restitution</a>, <a href="../../sims/dynamics/Shape.html#friction" target="_self">friction</a>, <a href="../../sims/dynamics/Shape.html#pos" target="_self">pos</a>, <a href="../../sims/dynamics/Shape.html#rotation" target="_self">rotation</a>, <a href="../../sims/dynamics/Shape.html#rotation0" target="_self">rotation0</a>, <a href="../../sims/dynamics/Shape.html#refLocalPos" target="_self">refLocalPos</a>, <a href="../../sims/dynamics/Shape.html#transientShapes" target="_self">transientShapes</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalRegularPolygon.html#draw%28%29" target="_self">draw</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Stellt das graphische Objekt dar.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalRegularPolygon.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalRegularPolygon.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalRegularPolygon.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalRegularPolygon.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalRegularPolygon.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalRegularPolygon.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/Drawable.html#correctY%28Double%29" target="_self">correctY</a>, <a href="../../graphyx/graphics/Drawable.html#drawLine%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawLine</a>, <a href="../../graphyx/graphics/Drawable.html#fillPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">fillPolygon</a>, <a href="../../graphyx/graphics/Drawable.html#drawPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">drawPolygon</a>, <a href="../../graphyx/graphics/Drawable.html#fillCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">fillCircle</a>, <a href="../../graphyx/graphics/Drawable.html#drawCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">drawCircle</a>, <a href="../../graphyx/graphics/Drawable.html#drawPoint%28sims.geometry.Vector2D%29" target="_self">drawPoint</a>, <a href="../../graphyx/graphics/Drawable.html#drawVector%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawVector</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../sims/dynamics/RegularPolygon.html" target="_self">RegularPolygon</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/dynamics/RegularPolygon.html#halfDiags" target="_self">halfDiags</a>, <a href="../../sims/dynamics/RegularPolygon.html#vertices" target="_self">vertices</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/geometry/ConvexPolygon.html#sides" target="_self">sides</a>, <a href="../../sims/geometry/ConvexPolygon.html#project%28sims.geometry.Vector2D%29" target="_self">project</a>, <a href="../../sims/geometry/ConvexPolygon.html#AABB" target="_self">AABB</a>, <a href="../../sims/geometry/ConvexPolygon.html#contains%28sims.geometry.Vector2D%29" target="_self">contains</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/dynamics/Shape.html#mass" target="_self">mass</a>, <a href="../../sims/dynamics/Shape.html#body" target="_self">body</a>, <a href="../../sims/dynamics/Shape.html#asBody" target="_self">asBody</a>, <a href="../../sims/dynamics/Shape.html#%7E%28sims.dynamics.Shape%29" target="_self">~</a>, <a href="../../sims/dynamics/Shape.html#%7E%28sims.dynamics.Body%29" target="_self">~</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>GraphicalRegularPolygon</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GraphicalRegularPolygon</span><span class="params">(<span name="real">real: <a href="../../sims/dynamics/RegularPolygon.html" class="extype" name="sims.dynamics.RegularPolygon">RegularPolygon</a></span>)</span><span class="result"> extends <a href="../../sims/dynamics/RegularPolygon.html" class="extype" name="sims.dynamics.RegularPolygon">RegularPolygon</a> with <a href="GraphicalShape.html" class="extype" name="graphyx.graphics.GraphicalShape">GraphicalShape</a> with <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="draw%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>draw</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Stellt das graphische Objekt dar.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/RegularPolygon.html" target="_self">RegularPolygon</a>.<a href="../../sims/dynamics/RegularPolygon.html#hashCode%28%29" target="_self">hashCode</a>
-        </dd>
-      </dl><hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.graphics.GraphicalShape">GraphicalShape</li><li class="in" name="graphyx.graphics.GraphicalObject">GraphicalObject</li><li class="in" name="graphyx.graphics.Drawable">Drawable</li><li class="in" name="sims.dynamics.RegularPolygon">RegularPolygon</li><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="sims.geometry.ConvexPolygon">ConvexPolygon</li><li class="in" name="sims.dynamics.Shape">Shape</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/RegularPolygon.html" target="_self">RegularPolygon</a>.<a href="../../sims/dynamics/RegularPolygon.html#toString%28%29" target="_self">toString</a>
-        </dd>
-      </dl><hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/RegularPolygon.html" target="_self">RegularPolygon</a>.<a href="../../sims/dynamics/RegularPolygon.html#equals%28Any%29" target="_self">equals</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/RegularPolygon.html" target="_self">RegularPolygon</a>.<a href="../../sims/dynamics/RegularPolygon.html#productPrefix" target="_self">productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.geometry.ConvexPolygon#AABB">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">AABB</span><span class="result">: <a href="../../sims/collision/AABB.html" class="extype" name="sims.collision.AABB">AABB</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns this polygon's axis aligned bounding box</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns this polygon's axis aligned bounding box.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/geometry/ConvexPolygon.html">ConvexPolygon</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.RegularPolygon#I">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">I</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Moment of inertia for a rotation about this shape's COM</p><div class="fullcomment">
+      <div class="comment cmt"><p>Moment of inertia for a rotation about this shape's COM.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/RegularPolygon.html">RegularPolygon</a> ⇐ <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#asBody">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">asBody</span><span class="result">: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Creates a new body made out of tis shape</p><div class="fullcomment">
+      <div class="comment cmt"><p>Creates a new body made out of tis shape.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#body">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">body</span><span class="result">: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns this shape's containing body</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns this shape's containing body.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalRegularPolygon#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Shape#collidable">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">collidable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Flag determining this shapes ability to collide with other shapes</p><div class="fullcomment">
+      <div class="comment cmt"><p>Flag determining this shapes ability to collide with other shapes.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.geometry.ConvexPolygon#contains">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">contains</span><span class="params">(<span name="point">point: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Checks if the point <code>point</code> is contained in this polygon</p><div class="fullcomment">
+      <div class="comment cmt"><p>Checks if the point <code>point</code> is contained in this polygon.
+<p>
+A ray is created, originating from the point and following an arbitrary direction (X-Axis was chosen).
+The number of intersections between the ray and this polygon's sides (including vertices) is counted.
+The amount of intersections with vertices is substracted form the previuos number.
+If the latter number is odd, the point is contained in the polygon.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/geometry/ConvexPolygon.html">ConvexPolygon</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#correctY">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctY</span><span class="params">(<span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent</p><div class="fullcomment">
+      <div class="comment cmt"><p>Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent.</p></div>
+      <dl class="paramcmts block"><dt class="param">y</dt><dd class="cmt"><p>zu korrigierender Wert</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.RegularPolygon#density">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">density</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Density</p><div class="fullcomment">
+      <div class="comment cmt"><p>Density. (Mass per area)</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/RegularPolygon.html">RegularPolygon</a> ⇐ <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalRegularPolygon#draw">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">draw</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Stellt das graphische Objekt dar</p><div class="fullcomment">
+      <div class="comment cmt"><p>Stellt das graphische Objekt dar.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawLine">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawLine</span><span class="params">(<span name="startPoint">startPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="endPoint">endPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt eine Linie auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt eine Linie auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">startPoint</dt><dd class="cmt"><p>Startpunkt in Weltkoordinaten</p></dd><dt class="param">endPoint</dt><dd class="cmt"><p>Endpunkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPoint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPoint</span><span class="params">(<span name="point">point: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Punkt auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Punkt auf <code>g</code>.
+<p>
+Der Punkt wird von einem Kreis umgeben.</p></div>
+      <dl class="paramcmts block"><dt class="param">point</dt><dd class="cmt"><p>Punkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawVector">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawVector</span><span class="params">(<span name="v">v: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="p">p: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Vektor auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Vektor auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">v</dt><dd class="cmt"><p>Vektor in Weltkoordinaten</p></dd><dt class="param">p</dt><dd class="cmt"><p>Ursprungspunkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalRegularPolygon#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen massiven Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen massiven Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein massives Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein massives Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#friction">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">friction</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Part of the coefficient of friction for a collision between this shape and another</p><div class="fullcomment">
+      <div class="comment cmt"><p>Part of the coefficient of friction for a collision between this shape and another.
+The coefficient of friction is calculated out of the product of this part and the other shape's part.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#g">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">g</span><span class="result">: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Java Graphics Objekt zur graphischen Darstellung</p><div class="fullcomment">
+      <div class="comment cmt"><p>Java Graphics Objekt zur graphischen Darstellung</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.RegularPolygon#halfDiags">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">halfDiags</span><span class="result">: <span class="extype" name="scala.Array">Array</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalRegularPolygon#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#mass">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">mass</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the mass of this shape</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the mass of this shape. The mass is given by volume times density.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.RegularPolygon#n">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">n</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Shape#pos">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">pos</span><span class="result">: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Position of this shape's COM (in world coordinates)</p><div class="fullcomment">
+      <div class="comment cmt"><p>Position of this shape's COM (in world coordinates).</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#ppm">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">ppm</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Anzahl von Pixeln pro Meter</p><div class="fullcomment">
+      <div class="comment cmt"><p>Anzahl von Pixeln pro Meter.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalRegularPolygon#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalRegularPolygon#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalRegularPolygon#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.ConvexPolygon#project">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">project</span><span class="params">(<span name="axis">axis: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <a href="../../sims/geometry/Projection.html" class="extype" name="sims.geometry.Projection">Projection</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the projection of this polygon onto the line given by the directional vector <code>axis</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the projection of this polygon onto the line given by the directional vector <code>axis</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">axis</dt><dd class="cmt"><p>directional vector of the line</p></dd><dt>returns</dt><dd class="cmt"><p>projection of this polygon</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="../../sims/geometry/ConvexPolygon.html">ConvexPolygon</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.RegularPolygon#radius">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">radius</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalRegularPolygon#real">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">real</span><span class="result">: <a href="../../sims/dynamics/RegularPolygon.html" class="extype" name="sims.dynamics.RegularPolygon">RegularPolygon</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Pointer to real object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Pointer to real object.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#refLocalPos">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">refLocalPos</span><span class="result">: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Local position of this shape's body COM to its COM at a body rotation of zero</p><div class="fullcomment">
+      <div class="comment cmt"><p>Local position of this shape's body COM to its COM at a body rotation of zero.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#restitution">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">restitution</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Part of the coefficient of restitution for a collision between this shape and another</p><div class="fullcomment">
+      <div class="comment cmt"><p>Part of the coefficient of restitution for a collision between this shape and another.
+The coefficient of restitution is calculated out of the product of this part and the other shape's part.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#rotation">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">rotation</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Rotation of this shape about its COM</p><div class="fullcomment">
+      <div class="comment cmt"><p>Rotation of this shape about its COM.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#rotation0">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">rotation0</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Initial rotation</p><div class="fullcomment">
+      <div class="comment cmt"><p>Initial rotation. Rotation of this shape before it was added to a body.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#scale">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">scale</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Skala in der die graphischen Objekte gezeichnet werden</p><div class="fullcomment">
+      <div class="comment cmt"><p>Skala in der die graphischen Objekte gezeichnet werden.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.geometry.ConvexPolygon#sides">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">sides</span><span class="result">: <span class="extype" name="scala.Array">Array</span>[<a href="../../sims/geometry/Segment.html" class="extype" name="sims.geometry.Segment">Segment</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns all sides of this polygon</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns all sides of this polygon. The sides are ordered counter-clockwise, the first vertex of the side
+giving the side index.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/geometry/ConvexPolygon.html">ConvexPolygon</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalRegularPolygon#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#transientShapes">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">transientShapes</span><span class="result">: <span class="extype" name="scala.collection.mutable.Set">Set</span>[<a href="../../sims/dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Shapes with which this shape cannot collide</p><div class="fullcomment">
+      <div class="comment cmt"><p>Shapes with which this shape cannot collide.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalShape#uid">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">uid</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Unique identification number</p><div class="fullcomment">
+      <div class="comment cmt"><p>Unique identification number.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="GraphicalShape.html">GraphicalShape</a> ⇐ <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.RegularPolygon#vertices">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">vertices</span><span class="result">: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns positions of all vertices of this Polygon</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns positions of all vertices of this Polygon. Vertices are ordered counter-clockwise.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/RegularPolygon.html">RegularPolygon</a> ⇐ <a href="../../sims/geometry/ConvexPolygon.html">ConvexPolygon</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.RegularPolygon#volume">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">volume</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Volume</p><div class="fullcomment">
+      <div class="comment cmt"><p>Volume. The volume is actually equivalent to this shape's area (SiMS is in 2D)
+and is used with this shape's density to calculate its mass.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/RegularPolygon.html">RegularPolygon</a> ⇐ <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#windowHeight">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">windowHeight</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Hoehe des Fensters in Pixeln</p><div class="fullcomment">
+      <div class="comment cmt"><p>Hoehe des Fensters in Pixeln.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#~">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">~</span><span class="params">(<span name="b">b: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>)</span><span class="result">: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Creates a new body out of this shape and the shapes of body <code>b</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Creates a new body out of this shape and the shapes of body <code>b</code>.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#~">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">~</span><span class="params">(<span name="s">s: <a href="../../sims/dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>)</span><span class="result">: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Creates a new body out of this shape and the shape <code>s</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Creates a new body out of this shape and the shape <code>s</code>.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/RegularPolygon.html" target="_self">RegularPolygon</a>.<a href="../../sims/dynamics/RegularPolygon.html#productArity" target="_self">productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.graphics.GraphicalRegularPolygon#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GraphicalRegularPolygon</span><span class="params">(<span name="real">real: <a href="../../sims/dynamics/RegularPolygon.html" class="extype" name="sims.dynamics.RegularPolygon">RegularPolygon</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.RegularPolygon#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GraphicalRegularPolygon</span><span class="params">(<span name="n">n: <span class="extype" name="scala.Int">Int</span></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>, <span name="density">density: <span class="extype" name="scala.Double">Double</span></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Shape#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GraphicalRegularPolygon</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/RegularPolygon.html" target="_self">RegularPolygon</a>.<a href="../../sims/dynamics/RegularPolygon.html#productElement%28Int%29" target="_self">productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/GraphicalRevoluteJoint$object.html b/doc/graphyx/graphics/GraphicalRevoluteJoint$object.html
deleted file mode 100644
index ad110a2..0000000
--- a/doc/graphyx/graphics/GraphicalRevoluteJoint$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object GraphicalRevoluteJoint in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">object  GraphicalRevoluteJoint</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/GraphicalRevoluteJoint"><code>graphyx/graphics/GraphicalRevoluteJoint.scala</code></a>]
-      </div><hr></hr>
-      <a name="GraphicalRevoluteJoint"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>GraphicalRevoluteJoint</em>
-      </dt>
-      <dd><code> extends </code>(<a href="../../sims/dynamics/joints/RevoluteJoint.html" target="_self">RevoluteJoint</a>) =&gt; <a href="../../graphyx/graphics/GraphicalRevoluteJoint.html" target="_self">GraphicalRevoluteJoint</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function1">scala.Function1</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function1">scala.Function1.toString</a>, <a href="#compose" target="contentFrame" class="scala/Function1">scala.Function1.compose</a>, <a href="#andThen" target="contentFrame" class="scala/Function1">scala.Function1.andThen</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/GraphicalRevoluteJoint.html b/doc/graphyx/graphics/GraphicalRevoluteJoint.html
index 3d0ab61..a553c4d 100644
--- a/doc/graphyx/graphics/GraphicalRevoluteJoint.html
+++ b/doc/graphyx/graphics/GraphicalRevoluteJoint.html
@@ -1,336 +1,439 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class GraphicalRevoluteJoint in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.graphics.GraphicalRevoluteJoint</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">class  GraphicalRevoluteJoint</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/GraphicalRevoluteJoint"><code>graphyx/graphics/GraphicalRevoluteJoint.scala</code></a>]
-      </div><hr></hr>
-      <a name="GraphicalRevoluteJoint"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>GraphicalRevoluteJoint</em>(<code>val </code><em>real</em> : <a href="../../sims/dynamics/joints/RevoluteJoint.html" target="_self">RevoluteJoint</a>)
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/graphics/GraphicalJoint.html" target="_self">GraphicalJoint</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">graphics</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalRevoluteJoint.html#connection1" target="_self">connection1</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/Drawable.html#g" target="_self">g</a>, <a href="../../graphyx/graphics/Drawable.html#ppm" target="_self">ppm</a>, <a href="../../graphyx/graphics/Drawable.html#scale" target="_self">scale</a>, <a href="../../graphyx/graphics/Drawable.html#windowHeight" target="_self">windowHeight</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalRevoluteJoint.html#draw%28%29" target="_self">draw</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Stellt das graphische Objekt dar.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalRevoluteJoint.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalRevoluteJoint.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalRevoluteJoint.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalRevoluteJoint.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalRevoluteJoint.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalRevoluteJoint.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/Drawable.html#correctY%28Double%29" target="_self">correctY</a>, <a href="../../graphyx/graphics/Drawable.html#drawLine%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawLine</a>, <a href="../../graphyx/graphics/Drawable.html#fillPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">fillPolygon</a>, <a href="../../graphyx/graphics/Drawable.html#drawPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">drawPolygon</a>, <a href="../../graphyx/graphics/Drawable.html#fillCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">fillCircle</a>, <a href="../../graphyx/graphics/Drawable.html#drawCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">drawCircle</a>, <a href="../../graphyx/graphics/Drawable.html#drawPoint%28sims.geometry.Vector2D%29" target="_self">drawPoint</a>, <a href="../../graphyx/graphics/Drawable.html#drawVector%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawVector</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>GraphicalRevoluteJoint</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GraphicalRevoluteJoint</span><span class="params">(<span name="real">real: <a href="../../sims/dynamics/joints/RevoluteJoint.html" class="extype" name="sims.dynamics.joints.RevoluteJoint">RevoluteJoint</a></span>)</span><span class="result"> extends <a href="GraphicalJoint.html" class="extype" name="graphyx.graphics.GraphicalJoint">GraphicalJoint</a> with <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="connection1"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>connection1</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="draw%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>draw</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Stellt das graphische Objekt dar.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="graphyx.graphics.GraphicalJoint">GraphicalJoint</li><li class="in" name="graphyx.graphics.GraphicalObject">GraphicalObject</li><li class="in" name="graphyx.graphics.Drawable">Drawable</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.graphics.GraphicalRevoluteJoint#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalRevoluteJoint#connection1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">connection1</span><span class="result">: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Drawable#correctY">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctY</span><span class="params">(<span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent</p><div class="fullcomment">
+      <div class="comment cmt"><p>Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent.</p></div>
+      <dl class="paramcmts block"><dt class="param">y</dt><dd class="cmt"><p>zu korrigierender Wert</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalRevoluteJoint#draw">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">draw</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Stellt das graphische Objekt dar</p><div class="fullcomment">
+      <div class="comment cmt"><p>Stellt das graphische Objekt dar.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawLine">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawLine</span><span class="params">(<span name="startPoint">startPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="endPoint">endPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt eine Linie auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt eine Linie auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">startPoint</dt><dd class="cmt"><p>Startpunkt in Weltkoordinaten</p></dd><dt class="param">endPoint</dt><dd class="cmt"><p>Endpunkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPoint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPoint</span><span class="params">(<span name="point">point: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Punkt auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Punkt auf <code>g</code>.
+<p>
+Der Punkt wird von einem Kreis umgeben.</p></div>
+      <dl class="paramcmts block"><dt class="param">point</dt><dd class="cmt"><p>Punkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawVector">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawVector</span><span class="params">(<span name="v">v: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="p">p: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Vektor auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Vektor auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">v</dt><dd class="cmt"><p>Vektor in Weltkoordinaten</p></dd><dt class="param">p</dt><dd class="cmt"><p>Ursprungspunkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalRevoluteJoint#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen massiven Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen massiven Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein massives Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein massives Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#g">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">g</span><span class="result">: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Java Graphics Objekt zur graphischen Darstellung</p><div class="fullcomment">
+      <div class="comment cmt"><p>Java Graphics Objekt zur graphischen Darstellung</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalRevoluteJoint#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#ppm">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">ppm</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Anzahl von Pixeln pro Meter</p><div class="fullcomment">
+      <div class="comment cmt"><p>Anzahl von Pixeln pro Meter.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalRevoluteJoint#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalRevoluteJoint#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalRevoluteJoint#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalRevoluteJoint#real">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">real</span><span class="result">: <a href="../../sims/dynamics/joints/RevoluteJoint.html" class="extype" name="sims.dynamics.joints.RevoluteJoint">RevoluteJoint</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Pointer to real object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Pointer to real object.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#scale">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">scale</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Skala in der die graphischen Objekte gezeichnet werden</p><div class="fullcomment">
+      <div class="comment cmt"><p>Skala in der die graphischen Objekte gezeichnet werden.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalRevoluteJoint#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#windowHeight">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">windowHeight</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Hoehe des Fensters in Pixeln</p><div class="fullcomment">
+      <div class="comment cmt"><p>Hoehe des Fensters in Pixeln.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.graphics.GraphicalRevoluteJoint#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GraphicalRevoluteJoint</span><span class="params">(<span name="real">real: <a href="../../sims/dynamics/joints/RevoluteJoint.html" class="extype" name="sims.dynamics.joints.RevoluteJoint">RevoluteJoint</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GraphicalRevoluteJoint</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/GraphicalShape.html b/doc/graphyx/graphics/GraphicalShape.html
index 574ec35..79786d0 100644
--- a/doc/graphyx/graphics/GraphicalShape.html
+++ b/doc/graphyx/graphics/GraphicalShape.html
@@ -1,176 +1,711 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>trait GraphicalShape in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.graphics.GraphicalShape</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">trait  GraphicalShape</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/GraphicalShape"><code>graphyx/graphics/GraphicalShape.scala</code></a>]
-      </div><hr></hr>
-      <a name="GraphicalShape"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>trait</code>
-        <em>GraphicalShape</em>
-      </dt>
-      <dd><code> extends </code><a href="../../sims/dynamics/Shape.html" target="_self">Shape</a><code> with </code><a href="../../graphyx/graphics/GraphicalObject.html" target="_self">GraphicalObject</a></dd>
-    </dl><dl>
-      <dt style="margin:10px 0 0 20px;"><b>Direct Known Subclasses:</b></dt>
-      <dd><a href="../../graphyx/graphics/GraphicalCircle.html" target="_self">GraphicalCircle</a>, <a href="../../graphyx/graphics/GraphicalRectangle.html" target="_self">GraphicalRectangle</a>, <a href="../../graphyx/graphics/GraphicalRegularPolygon.html" target="_self">GraphicalRegularPolygon</a></dd>
-      </dl><hr></hr>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">graphics</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalShape.html#real" target="_self">real</a></em>
-         : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>
+      <div id="definition">
+        <img src="../../lib/trait_big.png" />
+        <h1>GraphicalShape</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">trait</span>
+      <span class="symbol">
+        <span class="name">GraphicalShape</span><span class="result"> extends <a href="../../sims/dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a> with <a href="GraphicalObject.html" class="extype" name="graphyx.graphics.GraphicalObject">GraphicalObject</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      <div class="block">
+                known subclasses: <a href="GraphicalRegularPolygon.html">GraphicalRegularPolygon</a>, <a href="GraphicalRectangle.html">GraphicalRectangle</a>, <a href="GraphicalCircle.html">GraphicalCircle</a>
+              </div>
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.graphics.GraphicalObject">GraphicalObject</li><li class="in" name="graphyx.graphics.Drawable">Drawable</li><li class="in" name="sims.dynamics.Shape">Shape</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <div>Pointer to real object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalShape.html#uid" target="_self">uid</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
         
-        <div>Unique identification number.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/Drawable.html#g" target="_self">g</a>, <a href="../../graphyx/graphics/Drawable.html#ppm" target="_self">ppm</a>, <a href="../../graphyx/graphics/Drawable.html#scale" target="_self">scale</a>, <a href="../../graphyx/graphics/Drawable.html#windowHeight" target="_self">windowHeight</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/dynamics/Shape.html#density" target="_self">density</a> (abstract), <a href="../../sims/dynamics/Shape.html#volume" target="_self">volume</a> (abstract), <a href="../../sims/dynamics/Shape.html#I" target="_self">I</a> (abstract), <a href="../../sims/dynamics/Shape.html#collidable" target="_self">collidable</a>, <a href="../../sims/dynamics/Shape.html#restitution" target="_self">restitution</a>, <a href="../../sims/dynamics/Shape.html#friction" target="_self">friction</a>, <a href="../../sims/dynamics/Shape.html#pos" target="_self">pos</a>, <a href="../../sims/dynamics/Shape.html#rotation" target="_self">rotation</a>, <a href="../../sims/dynamics/Shape.html#rotation0" target="_self">rotation0</a>, <a href="../../sims/dynamics/Shape.html#refLocalPos" target="_self">refLocalPos</a>, <a href="../../sims/dynamics/Shape.html#transientShapes" target="_self">transientShapes</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/Drawable.html#correctY%28Double%29" target="_self">correctY</a>, <a href="../../graphyx/graphics/Drawable.html#drawLine%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawLine</a>, <a href="../../graphyx/graphics/Drawable.html#fillPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">fillPolygon</a>, <a href="../../graphyx/graphics/Drawable.html#drawPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">drawPolygon</a>, <a href="../../graphyx/graphics/Drawable.html#fillCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">fillCircle</a>, <a href="../../graphyx/graphics/Drawable.html#drawCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">drawCircle</a>, <a href="../../graphyx/graphics/Drawable.html#drawPoint%28sims.geometry.Vector2D%29" target="_self">drawPoint</a>, <a href="../../graphyx/graphics/Drawable.html#drawVector%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawVector</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/dynamics/Shape.html#AABB" target="_self">AABB</a> (abstract), <a href="../../sims/dynamics/Shape.html#project%28sims.geometry.Vector2D%29" target="_self">project</a> (abstract), <a href="../../sims/dynamics/Shape.html#contains%28sims.geometry.Vector2D%29" target="_self">contains</a> (abstract), <a href="../../sims/dynamics/Shape.html#mass" target="_self">mass</a>, <a href="../../sims/dynamics/Shape.html#body" target="_self">body</a>, <a href="../../sims/dynamics/Shape.html#asBody" target="_self">asBody</a>, <a href="../../sims/dynamics/Shape.html#%7E%28sims.dynamics.Shape%29" target="_self">~</a>, <a href="../../sims/dynamics/Shape.html#%7E%28sims.dynamics.Body%29" target="_self">~</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/graphics/GraphicalObject.html" target="_self">GraphicalObject</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/GraphicalObject.html#draw%28%29" target="_self">draw</a> (abstract)
-        </td></tr>
-      </table>
-
-
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.dynamics.Shape#AABB">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">AABB</span><span class="result">: <a href="../../sims/collision/AABB.html" class="extype" name="sims.collision.AABB">AABB</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns this shape's axis aligned bounding box</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns this shape's axis aligned bounding box.</p></div>
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="real"></a><dl>
-      <dt>
+      <div class="block">
+            attributes: abstract 
+          </div>
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#I">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">I</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Moment of inertia for a rotation about this shape's COM</p><div class="fullcomment">
+      <div class="comment cmt"><p>Moment of inertia for a rotation about this shape's COM.</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#asBody">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">asBody</span><span class="result">: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Creates a new body made out of tis shape</p><div class="fullcomment">
+      <div class="comment cmt"><p>Creates a new body made out of tis shape.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#body">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">body</span><span class="result">: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns this shape's containing body</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns this shape's containing body.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#collidable">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">collidable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Flag determining this shapes ability to collide with other shapes</p><div class="fullcomment">
+      <div class="comment cmt"><p>Flag determining this shapes ability to collide with other shapes.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#contains">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">contains</span><span class="params">(<span name="point">point: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Checks if the point <code>point</code> is contained in this shape</p><div class="fullcomment">
+      <div class="comment cmt"><p>Checks if the point <code>point</code> is contained in this shape.</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#correctY">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctY</span><span class="params">(<span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent</p><div class="fullcomment">
+      <div class="comment cmt"><p>Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent.</p></div>
+      <dl class="paramcmts block"><dt class="param">y</dt><dd class="cmt"><p>zu korrigierender Wert</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#density">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">density</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Density</p><div class="fullcomment">
+      <div class="comment cmt"><p>Density. (Mass per area)</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalObject#draw">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">draw</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Stellt das graphische Objekt dar</p><div class="fullcomment">
+      <div class="comment cmt"><p>Stellt das graphische Objekt dar.</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      <div class="block">
+            definition classes: <a href="GraphicalObject.html">GraphicalObject</a> ⇐ <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawLine">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawLine</span><span class="params">(<span name="startPoint">startPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="endPoint">endPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt eine Linie auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt eine Linie auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">startPoint</dt><dd class="cmt"><p>Startpunkt in Weltkoordinaten</p></dd><dt class="param">endPoint</dt><dd class="cmt"><p>Endpunkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPoint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPoint</span><span class="params">(<span name="point">point: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Punkt auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Punkt auf <code>g</code>.
+<p>
+Der Punkt wird von einem Kreis umgeben.</p></div>
+      <dl class="paramcmts block"><dt class="param">point</dt><dd class="cmt"><p>Punkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawVector">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawVector</span><span class="params">(<span name="v">v: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="p">p: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Vektor auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Vektor auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">v</dt><dd class="cmt"><p>Vektor in Weltkoordinaten</p></dd><dt class="param">p</dt><dd class="cmt"><p>Ursprungspunkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen massiven Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen massiven Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein massives Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein massives Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#friction">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">friction</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Part of the coefficient of friction for a collision between this shape and another</p><div class="fullcomment">
+      <div class="comment cmt"><p>Part of the coefficient of friction for a collision between this shape and another.
+The coefficient of friction is calculated out of the product of this part and the other shape's part.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#g">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">g</span><span class="result">: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Java Graphics Objekt zur graphischen Darstellung</p><div class="fullcomment">
+      <div class="comment cmt"><p>Java Graphics Objekt zur graphischen Darstellung</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#mass">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">mass</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the mass of this shape</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the mass of this shape. The mass is given by volume times density.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#pos">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">pos</span><span class="result">: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Position of this shape's COM (in world coordinates)</p><div class="fullcomment">
+      <div class="comment cmt"><p>Position of this shape's COM (in world coordinates).</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#ppm">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">ppm</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Anzahl von Pixeln pro Meter</p><div class="fullcomment">
+      <div class="comment cmt"><p>Anzahl von Pixeln pro Meter.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#project">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">project</span><span class="params">(<span name="axis">axis: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <a href="../../sims/geometry/Projection.html" class="extype" name="sims.geometry.Projection">Projection</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the projection of this shape onto the line given by the directional vector <code>axis</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the projection of this shape onto the line given by the directional vector <code>axis</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">axis</dt><dd class="cmt"><p>directional vector of the line</p></dd><dt>returns</dt><dd class="cmt"><p>projection of this shape</p></dd></dl>
+      <div class="block">
+            attributes: abstract 
+          </div>
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalShape#real">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">real</span><span class="result">: <a href="../../sims/dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Pointer to real object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Pointer to real object.</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#refLocalPos">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">refLocalPos</span><span class="result">: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Local position of this shape's body COM to its COM at a body rotation of zero</p><div class="fullcomment">
+      <div class="comment cmt"><p>Local position of this shape's body COM to its COM at a body rotation of zero.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#restitution">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">restitution</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Part of the coefficient of restitution for a collision between this shape and another</p><div class="fullcomment">
+      <div class="comment cmt"><p>Part of the coefficient of restitution for a collision between this shape and another.
+The coefficient of restitution is calculated out of the product of this part and the other shape's part.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#rotation">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">rotation</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Rotation of this shape about its COM</p><div class="fullcomment">
+      <div class="comment cmt"><p>Rotation of this shape about its COM.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#rotation0">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">rotation0</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Initial rotation</p><div class="fullcomment">
+      <div class="comment cmt"><p>Initial rotation. Rotation of this shape before it was added to a body.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#scale">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">scale</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Skala in der die graphischen Objekte gezeichnet werden</p><div class="fullcomment">
+      <div class="comment cmt"><p>Skala in der die graphischen Objekte gezeichnet werden.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#transientShapes">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">transientShapes</span><span class="result">: <span class="extype" name="scala.collection.mutable.Set">Set</span>[<a href="../../sims/dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Shapes with which this shape cannot collide</p><div class="fullcomment">
+      <div class="comment cmt"><p>Shapes with which this shape cannot collide.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalShape#uid">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">uid</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Unique identification number</p><div class="fullcomment">
+      <div class="comment cmt"><p>Unique identification number.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#volume">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">volume</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Volume</p><div class="fullcomment">
+      <div class="comment cmt"><p>Volume. The volume is actually equivalent to this shape's area (SiMS is in 2D)
+and is used with this shape's density to calculate its mass.</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#windowHeight">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">windowHeight</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Hoehe des Fensters in Pixeln</p><div class="fullcomment">
+      <div class="comment cmt"><p>Hoehe des Fensters in Pixeln.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#~">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">~</span><span class="params">(<span name="b">b: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>)</span><span class="result">: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Creates a new body out of this shape and the shapes of body <code>b</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Creates a new body out of this shape and the shapes of body <code>b</code>.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#~">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">~</span><span class="params">(<span name="s">s: <a href="../../sims/dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>)</span><span class="result">: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Creates a new body out of this shape and the shape <code>s</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Creates a new body out of this shape and the shape <code>s</code>.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../../sims/dynamics/Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code>abstract</code>
-        <code>val</code>
-        <em>real</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Pointer to real object.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/graphics/GraphicalObject.html" target="_self">GraphicalObject</a>.<a href="../../graphyx/graphics/GraphicalObject.html#real" target="_self">real</a>
-        </dd>
-      </dl><hr></hr>
-<a name="uid"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>val</code>
-        <em>uid</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Unique identification number.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>.<a href="../../sims/dynamics/Shape.html#uid" target="_self">uid</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+        
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/GraphicalSpringJoint$object.html b/doc/graphyx/graphics/GraphicalSpringJoint$object.html
deleted file mode 100644
index 0c4853f..0000000
--- a/doc/graphyx/graphics/GraphicalSpringJoint$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object GraphicalSpringJoint in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">object  GraphicalSpringJoint</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/GraphicalSpringJoint"><code>graphyx/graphics/GraphicalSpringJoint.scala</code></a>]
-      </div><hr></hr>
-      <a name="GraphicalSpringJoint"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>GraphicalSpringJoint</em>
-      </dt>
-      <dd><code> extends </code>(<a href="../../sims/dynamics/joints/SpringJoint.html" target="_self">SpringJoint</a>) =&gt; <a href="../../graphyx/graphics/GraphicalSpringJoint.html" target="_self">GraphicalSpringJoint</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function1">scala.Function1</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function1">scala.Function1.toString</a>, <a href="#compose" target="contentFrame" class="scala/Function1">scala.Function1.compose</a>, <a href="#andThen" target="contentFrame" class="scala/Function1">scala.Function1.andThen</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/GraphicalSpringJoint.html b/doc/graphyx/graphics/GraphicalSpringJoint.html
index 5cf80cf..438c01b 100644
--- a/doc/graphyx/graphics/GraphicalSpringJoint.html
+++ b/doc/graphyx/graphics/GraphicalSpringJoint.html
@@ -1,356 +1,447 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class GraphicalSpringJoint in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.graphics.GraphicalSpringJoint</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">class  GraphicalSpringJoint</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/GraphicalSpringJoint"><code>graphyx/graphics/GraphicalSpringJoint.scala</code></a>]
-      </div><hr></hr>
-      <a name="GraphicalSpringJoint"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>GraphicalSpringJoint</em>(<code>val </code><em>real</em> : <a href="../../sims/dynamics/joints/SpringJoint.html" target="_self">SpringJoint</a>)
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/graphics/GraphicalJoint.html" target="_self">GraphicalJoint</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">graphics</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalSpringJoint.html#connection1" target="_self">connection1</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalSpringJoint.html#connection2" target="_self">connection2</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/Drawable.html#g" target="_self">g</a>, <a href="../../graphyx/graphics/Drawable.html#ppm" target="_self">ppm</a>, <a href="../../graphyx/graphics/Drawable.html#scale" target="_self">scale</a>, <a href="../../graphyx/graphics/Drawable.html#windowHeight" target="_self">windowHeight</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalSpringJoint.html#draw%28%29" target="_self">draw</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Stellt das graphische Objekt dar.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalSpringJoint.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalSpringJoint.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalSpringJoint.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalSpringJoint.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalSpringJoint.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalSpringJoint.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/graphics/Drawable.html#correctY%28Double%29" target="_self">correctY</a>, <a href="../../graphyx/graphics/Drawable.html#drawLine%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawLine</a>, <a href="../../graphyx/graphics/Drawable.html#fillPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">fillPolygon</a>, <a href="../../graphyx/graphics/Drawable.html#drawPolygon%28Seq%5Bsims.geometry.Vector2D%5D%29" target="_self">drawPolygon</a>, <a href="../../graphyx/graphics/Drawable.html#fillCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">fillCircle</a>, <a href="../../graphyx/graphics/Drawable.html#drawCircle%28sims.geometry.Vector2D%2CDouble%29" target="_self">drawCircle</a>, <a href="../../graphyx/graphics/Drawable.html#drawPoint%28sims.geometry.Vector2D%29" target="_self">drawPoint</a>, <a href="../../graphyx/graphics/Drawable.html#drawVector%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">drawVector</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>GraphicalSpringJoint</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GraphicalSpringJoint</span><span class="params">(<span name="real">real: <a href="../../sims/dynamics/joints/SpringJoint.html" class="extype" name="sims.dynamics.joints.SpringJoint">SpringJoint</a></span>)</span><span class="result"> extends <a href="GraphicalJoint.html" class="extype" name="graphyx.graphics.GraphicalJoint">GraphicalJoint</a> with <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="connection1"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>connection1</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="connection2"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>connection2</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="draw%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>draw</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Stellt das graphische Objekt dar.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="graphyx.graphics.GraphicalJoint">GraphicalJoint</li><li class="in" name="graphyx.graphics.GraphicalObject">GraphicalObject</li><li class="in" name="graphyx.graphics.Drawable">Drawable</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.graphics.GraphicalSpringJoint#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalSpringJoint#connection1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">connection1</span><span class="result">: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalSpringJoint#connection2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">connection2</span><span class="result">: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Drawable#correctY">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctY</span><span class="params">(<span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent</p><div class="fullcomment">
+      <div class="comment cmt"><p>Korrigiert einen Y-Wert in Bildschirmkoordinaten zu seinem kartesischen Aequivalent.</p></div>
+      <dl class="paramcmts block"><dt class="param">y</dt><dd class="cmt"><p>zu korrigierender Wert</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalSpringJoint#draw">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">draw</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Stellt das graphische Objekt dar</p><div class="fullcomment">
+      <div class="comment cmt"><p>Stellt das graphische Objekt dar.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawLine">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawLine</span><span class="params">(<span name="startPoint">startPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="endPoint">endPoint: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt eine Linie auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt eine Linie auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">startPoint</dt><dd class="cmt"><p>Startpunkt in Weltkoordinaten</p></dd><dt class="param">endPoint</dt><dd class="cmt"><p>Endpunkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPoint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPoint</span><span class="params">(<span name="point">point: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Punkt auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Punkt auf <code>g</code>.
+<p>
+Der Punkt wird von einem Kreis umgeben.</p></div>
+      <dl class="paramcmts block"><dt class="param">point</dt><dd class="cmt"><p>Punkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#drawVector">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawVector</span><span class="params">(<span name="v">v: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="p">p: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen Vektor auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen Vektor auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">v</dt><dd class="cmt"><p>Vektor in Weltkoordinaten</p></dd><dt class="param">p</dt><dd class="cmt"><p>Ursprungspunkt in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalSpringJoint#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillCircle">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillCircle</span><span class="params">(<span name="center">center: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt einen massiven Kreis auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt einen massiven Kreis auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">center</dt><dd class="cmt"><p>Mitte des Kreises in Weltkoordinaten</p></dd><dt class="param">radius</dt><dd class="cmt"><p>Radius des Kreises</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#fillPolygon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fillPolygon</span><span class="params">(<span name="points">points: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Malt ein massives Polygon auf <code>g</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Malt ein massives Polygon auf <code>g</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">points</dt><dd class="cmt"><p>Eckpunkte des Polygons in Weltkoordinaten</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#g">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">g</span><span class="result">: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Java Graphics Objekt zur graphischen Darstellung</p><div class="fullcomment">
+      <div class="comment cmt"><p>Java Graphics Objekt zur graphischen Darstellung</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalSpringJoint#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#ppm">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">ppm</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Anzahl von Pixeln pro Meter</p><div class="fullcomment">
+      <div class="comment cmt"><p>Anzahl von Pixeln pro Meter.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalSpringJoint#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalSpringJoint#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalSpringJoint#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalSpringJoint#real">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">real</span><span class="result">: <a href="../../sims/dynamics/joints/SpringJoint.html" class="extype" name="sims.dynamics.joints.SpringJoint">SpringJoint</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Pointer to real object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Pointer to real object.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#scale">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">scale</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Skala in der die graphischen Objekte gezeichnet werden</p><div class="fullcomment">
+      <div class="comment cmt"><p>Skala in der die graphischen Objekte gezeichnet werden.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalSpringJoint#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Drawable#windowHeight">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">windowHeight</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Hoehe des Fensters in Pixeln</p><div class="fullcomment">
+      <div class="comment cmt"><p>Hoehe des Fensters in Pixeln.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Drawable.html">Drawable</a>
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.graphics.GraphicalSpringJoint#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GraphicalSpringJoint</span><span class="params">(<span name="real">real: <a href="../../sims/dynamics/joints/SpringJoint.html" class="extype" name="sims.dynamics.joints.SpringJoint">SpringJoint</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GraphicalSpringJoint</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/GraphicalWorld$object.html b/doc/graphyx/graphics/GraphicalWorld$object.html
deleted file mode 100644
index 2b29226..0000000
--- a/doc/graphyx/graphics/GraphicalWorld$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object GraphicalWorld in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">object  GraphicalWorld</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/GraphicalWorld"><code>graphyx/graphics/GraphicalWorld.scala</code></a>]
-      </div><hr></hr>
-      <a name="GraphicalWorld"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>GraphicalWorld</em>
-      </dt>
-      <dd><code> extends </code>(<a href="../../sims/dynamics/World.html" target="_self">World</a>) =&gt; <a href="../../graphyx/graphics/GraphicalWorld.html" target="_self">GraphicalWorld</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function1">scala.Function1</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function1">scala.Function1.toString</a>, <a href="#compose" target="contentFrame" class="scala/Function1">scala.Function1.compose</a>, <a href="#andThen" target="contentFrame" class="scala/Function1">scala.Function1.andThen</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/GraphicalWorld.html b/doc/graphyx/graphics/GraphicalWorld.html
index d04da4e..715b0ca 100644
--- a/doc/graphyx/graphics/GraphicalWorld.html
+++ b/doc/graphyx/graphics/GraphicalWorld.html
@@ -1,439 +1,289 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class GraphicalWorld in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.graphics.GraphicalWorld</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">class  GraphicalWorld</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/GraphicalWorld"><code>graphyx/graphics/GraphicalWorld.scala</code></a>]
-      </div><hr></hr>
-      <a name="GraphicalWorld"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>GraphicalWorld</em>(<code>val </code><em>real</em> : <a href="../../sims/dynamics/World.html" target="_self">World</a>)
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">graphics</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalWorld.html#enableCollisionDetection" target="_self">enableCollisionDetection</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalWorld.html#enablePositionCorrection" target="_self">enablePositionCorrection</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalWorld.html#gravity" target="_self">gravity</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalWorld.html#iterations" target="_self">iterations</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalWorld.html#monitorResults" target="_self">monitorResults</a></em>
-         : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>]
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalWorld.html#overCWarning" target="_self">overCWarning</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalWorld.html#time" target="_self">time</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalWorld.html#timeStep" target="_self">timeStep</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalWorld.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalWorld.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalWorld.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalWorld.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalWorld.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/GraphicalWorld.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>GraphicalWorld</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GraphicalWorld</span><span class="params">(<span name="real">real: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>)</span><span class="result"> extends <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="time"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>time</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="timeStep"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>timeStep</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="iterations"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>iterations</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="overCWarning"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>overCWarning</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="gravity"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>gravity</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="monitorResults"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>monitorResults</em> : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>]
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="enableCollisionDetection"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>enableCollisionDetection</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="enablePositionCorrection"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>enablePositionCorrection</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.graphics.GraphicalWorld#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalWorld#enableCollisionDetection">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">enableCollisionDetection</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalWorld#enablePositionCorrection">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">enablePositionCorrection</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalWorld#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalWorld#gravity">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">gravity</span><span class="result">: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalWorld#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.GraphicalWorld#iterations">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">iterations</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalWorld#monitorFlatResults">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">monitorFlatResults</span><span class="result">: <span class="extype" name="scala.collection.mutable.ArrayBuffer">ArrayBuffer</span>[(<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="java.lang.String">String</span>, <span class="extype" name="scala.Any">Any</span>)]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalWorld#monitorResults">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">monitorResults</span><span class="result">: <span class="extype" name="scala.collection.mutable.ArrayBuffer">ArrayBuffer</span>[<a href="MonitorResult.html" class="extype" name="graphyx.graphics.MonitorResult">MonitorResult</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalWorld#overCWarning">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">overCWarning</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalWorld#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalWorld#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalWorld#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalWorld#real">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">real</span><span class="result">: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalWorld#time">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">time</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalWorld#timeStep">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">timeStep</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.GraphicalWorld#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.graphics.GraphicalWorld#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GraphicalWorld</span><span class="params">(<span name="real">real: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GraphicalWorld</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/MonitorResult.html b/doc/graphyx/graphics/MonitorResult.html
new file mode 100644
index 0000000..53aa680
--- /dev/null
+++ b/doc/graphyx/graphics/MonitorResult.html
@@ -0,0 +1,183 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.graphics.MonitorResult</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="type">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">graphics</a></p>
+
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>MonitorResult</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">MonitorResult</span><span class="result"> extends AnyRef</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.MonitorResult#monitor">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">monitor</span><span class="result">: (<span class="extype" name="java.lang.String">String</span>, (<a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a>) ⇒ <span class="extype" name="scala.Any">Any</span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.MonitorResult#results">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">results</span><span class="result">: <span class="extype" name="scala.collection.immutable.List">List</span>[(<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="java.lang.String">String</span>, <span class="extype" name="scala.Any">Any</span>)]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.graphics.MonitorResult#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">MonitorResult</span><span class="params">(<span name="monitor">monitor: (<span class="extype" name="java.lang.String">String</span>, (<a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a>) ⇒ <span class="extype" name="scala.Any">Any</span>)</span>, <span name="results">results: <span class="extype" name="scala.collection.immutable.List">List</span>[(<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="java.lang.String">String</span>, <span class="extype" name="scala.Any">Any</span>)]</span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">MonitorResult</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/Parser$.html b/doc/graphyx/graphics/Parser$.html
new file mode 100644
index 0000000..2c6cf06
--- /dev/null
+++ b/doc/graphyx/graphics/Parser$.html
@@ -0,0 +1,204 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.graphics.Parser</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">graphics</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>Parser</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Parser</span><span class="result"> extends AnyRef</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.graphics.Parser#throwOnUnknown">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">throwOnUnknown</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Parser#toGraphical">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toGraphical</span><span class="params">(<span name="real">real: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>)</span><span class="result">: <a href="GraphicalBody.html" class="extype" name="graphyx.graphics.GraphicalBody">GraphicalBody</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Parser#toGraphical">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toGraphical</span><span class="params">(<span name="real">real: <a href="../../sims/collision/AABB.html" class="extype" name="sims.collision.AABB">AABB</a></span>)</span><span class="result">: <a href="GraphicalAABB.html" class="extype" name="graphyx.graphics.GraphicalAABB">GraphicalAABB</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Parser#toGraphical">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toGraphical</span><span class="params">(<span name="real">real: <a href="../../sims/collision/Pair.html" class="extype" name="sims.collision.Pair">Pair</a></span>)</span><span class="result">: <a href="GraphicalPair.html" class="extype" name="graphyx.graphics.GraphicalPair">GraphicalPair</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Parser#toGraphical">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toGraphical</span><span class="params">(<span name="real">real: <a href="../../sims/collision/Collision.html" class="extype" name="sims.collision.Collision">Collision</a></span>)</span><span class="result">: <a href="GraphicalCollision.html" class="extype" name="graphyx.graphics.GraphicalCollision">GraphicalCollision</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Parser#toGraphical">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toGraphical</span><span class="params">(<span name="real">real: <a href="../../sims/dynamics/joints/Joint.html" class="extype" name="sims.dynamics.joints.Joint">Joint</a></span>)</span><span class="result">: <a href="GraphicalJoint.html" class="extype" name="graphyx.graphics.GraphicalJoint">GraphicalJoint</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Parser#toGraphical">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toGraphical</span><span class="params">(<span name="real">real: <a href="../../sims/dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>)</span><span class="result">: <a href="GraphicalShape.html" class="extype" name="graphyx.graphics.GraphicalShape">GraphicalShape</a> with <span class="extype" name="scala.Product">Product</span> {...}</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/Parser$object.html b/doc/graphyx/graphics/Parser$object.html
deleted file mode 100644
index b74e777..0000000
--- a/doc/graphyx/graphics/Parser$object.html
+++ /dev/null
@@ -1,221 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Parser in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">object  Parser</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/Parser"><code>graphyx/graphics/Parser.scala</code></a>]
-      </div><hr></hr>
-      <a name="Parser"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Parser</em>
-      </dt>
-      <dd><code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a></dd>
-    </dl>
-      
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Parser$object.html#throwOnUnknown" target="_self">throwOnUnknown</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Parser$object.html#toGraphical%28sims.dynamics.Shape%29" target="_self">toGraphical</a></em>
-        (<em>real</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>) : <a href="../../graphyx/graphics/GraphicalShape.html" target="_self">GraphicalShape</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Parser$object.html#toGraphical%28sims.collision.Pair%29" target="_self">toGraphical</a></em>
-        (<em>real</em> : <a href="../../sims/collision/Pair.html" target="_self">Pair</a>) : <a href="../../graphyx/graphics/GraphicalPair.html" target="_self">GraphicalPair</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Parser$object.html#toGraphical%28sims.collision.AABB%29" target="_self">toGraphical</a></em>
-        (<em>real</em> : <a href="../../sims/collision/AABB.html" target="_self">AABB</a>) : <a href="../../graphyx/graphics/GraphicalAABB.html" target="_self">GraphicalAABB</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Parser$object.html#toGraphical%28sims.dynamics.Body%29" target="_self">toGraphical</a></em>
-        (<em>real</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>) : <a href="../../graphyx/graphics/GraphicalBody.html" target="_self">GraphicalBody</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Parser$object.html#toGraphical%28sims.collision.Collision%29" target="_self">toGraphical</a></em>
-        (<em>real</em> : <a href="../../sims/collision/Collision.html" target="_self">Collision</a>) : <a href="../../graphyx/graphics/GraphicalCollision.html" target="_self">GraphicalCollision</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Parser$object.html#toGraphical%28sims.dynamics.joints.Joint%29" target="_self">toGraphical</a></em>
-        (<em>real</em> : <a href="../../sims/dynamics/joints/Joint.html" target="_self">Joint</a>) : <a href="../../graphyx/graphics/GraphicalJoint.html" target="_self">GraphicalJoint</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="throwOnUnknown"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>throwOnUnknown</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="toGraphical%28sims.dynamics.Shape%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>toGraphical</em>(<em>real</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>) : <a href="../../graphyx/graphics/GraphicalShape.html" target="_self">GraphicalShape</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="toGraphical%28sims.dynamics.joints.Joint%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>toGraphical</em>(<em>real</em> : <a href="../../sims/dynamics/joints/Joint.html" target="_self">Joint</a>) : <a href="../../graphyx/graphics/GraphicalJoint.html" target="_self">GraphicalJoint</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="toGraphical%28sims.collision.Collision%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>toGraphical</em>(<em>real</em> : <a href="../../sims/collision/Collision.html" target="_self">Collision</a>) : <a href="../../graphyx/graphics/GraphicalCollision.html" target="_self">GraphicalCollision</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="toGraphical%28sims.collision.Pair%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>toGraphical</em>(<em>real</em> : <a href="../../sims/collision/Pair.html" target="_self">Pair</a>) : <a href="../../graphyx/graphics/GraphicalPair.html" target="_self">GraphicalPair</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="toGraphical%28sims.collision.AABB%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>toGraphical</em>(<em>real</em> : <a href="../../sims/collision/AABB.html" target="_self">AABB</a>) : <a href="../../graphyx/graphics/GraphicalAABB.html" target="_self">GraphicalAABB</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="toGraphical%28sims.dynamics.Body%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>toGraphical</em>(<em>real</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>) : <a href="../../graphyx/graphics/GraphicalBody.html" target="_self">GraphicalBody</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/Scene$object.html b/doc/graphyx/graphics/Scene$object.html
deleted file mode 100644
index e884f9f..0000000
--- a/doc/graphyx/graphics/Scene$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Scene in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">object  Scene</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/Scene"><code>graphyx/graphics/Scene.scala</code></a>]
-      </div><hr></hr>
-      <a name="Scene"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Scene</em>
-      </dt>
-      <dd><code> extends </code>(<a href="../../sims/dynamics/World.html" target="_self">World</a>) =&gt; <a href="../../graphyx/graphics/Scene.html" target="_self">Scene</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function1">scala.Function1</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function1">scala.Function1.toString</a>, <a href="#compose" target="contentFrame" class="scala/Function1">scala.Function1.compose</a>, <a href="#andThen" target="contentFrame" class="scala/Function1">scala.Function1.andThen</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/Scene.html b/doc/graphyx/graphics/Scene.html
index ab0f4df..1f288fc 100644
--- a/doc/graphyx/graphics/Scene.html
+++ b/doc/graphyx/graphics/Scene.html
@@ -1,439 +1,281 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class Scene in graphyx.graphics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.graphics.Scene</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/graphics$package.html" target="_self">graphyx.graphics</a>
-        <br></br>
-        <span class="entity">class  Scene</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/graphics/Scene"><code>graphyx/graphics/Scene.scala</code></a>]
-      </div><hr></hr>
-      <a name="Scene"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>Scene</em>(<code>val </code><em>real</em> : <a href="../../sims/dynamics/World.html" target="_self">World</a>)
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">graphics</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Scene.html#aabbs" target="_self">aabbs</a></em>
-         : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../graphyx/graphics/GraphicalAABB.html" target="_self">GraphicalAABB</a>]
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Scene.html#bodies" target="_self">bodies</a></em>
-         : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../graphyx/graphics/GraphicalBody.html" target="_self">GraphicalBody</a>]
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Scene.html#collisions" target="_self">collisions</a></em>
-         : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../graphyx/graphics/GraphicalCollision.html" target="_self">GraphicalCollision</a>]
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Scene.html#fps" target="_self">fps</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Scene.html#joints" target="_self">joints</a></em>
-         : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../graphyx/graphics/GraphicalJoint.html" target="_self">GraphicalJoint</a>]
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Scene.html#pairs" target="_self">pairs</a></em>
-         : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../graphyx/graphics/GraphicalPair.html" target="_self">GraphicalPair</a>]
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Scene.html#shapes" target="_self">shapes</a></em>
-         : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../graphyx/graphics/GraphicalShape.html" target="_self">GraphicalShape</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>]
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Scene.html#world" target="_self">world</a></em>
-         : <a href="../../graphyx/graphics/GraphicalWorld.html" target="_self">GraphicalWorld</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Scene.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Scene.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Scene.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Scene.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Scene.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/graphics/Scene.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>Scene</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Scene</span><span class="params">(<span name="real">real: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>)</span><span class="result"> extends <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="world"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>world</em> : <a href="../../graphyx/graphics/GraphicalWorld.html" target="_self">GraphicalWorld</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="shapes"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>shapes</em> : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../graphyx/graphics/GraphicalShape.html" target="_self">GraphicalShape</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>]
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="joints"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>joints</em> : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../graphyx/graphics/GraphicalJoint.html" target="_self">GraphicalJoint</a>]
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="bodies"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>bodies</em> : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../graphyx/graphics/GraphicalBody.html" target="_self">GraphicalBody</a>]
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="collisions"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>collisions</em> : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../graphyx/graphics/GraphicalCollision.html" target="_self">GraphicalCollision</a>]
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="pairs"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>pairs</em> : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../graphyx/graphics/GraphicalPair.html" target="_self">GraphicalPair</a>]
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="aabbs"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>aabbs</em> : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../graphyx/graphics/GraphicalAABB.html" target="_self">GraphicalAABB</a>]
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="fps"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>fps</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.graphics.Scene#aabbs">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">aabbs</span><span class="result">: <span class="extype" name="scala.collection.mutable.ArrayBuffer">ArrayBuffer</span>[<a href="GraphicalAABB.html" class="extype" name="graphyx.graphics.GraphicalAABB">GraphicalAABB</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Scene#bodies">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">bodies</span><span class="result">: <span class="extype" name="scala.collection.mutable.ArrayBuffer">ArrayBuffer</span>[<a href="GraphicalBody.html" class="extype" name="graphyx.graphics.GraphicalBody">GraphicalBody</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Scene#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Scene#collisions">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">collisions</span><span class="result">: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="GraphicalCollision.html" class="extype" name="graphyx.graphics.GraphicalCollision">GraphicalCollision</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Scene#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Scene#fps">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">fps</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Scene#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Scene#joints">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">joints</span><span class="result">: <span class="extype" name="scala.collection.mutable.ArrayBuffer">ArrayBuffer</span>[<a href="GraphicalJoint.html" class="extype" name="graphyx.graphics.GraphicalJoint">GraphicalJoint</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Scene#pairs">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">pairs</span><span class="result">: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="GraphicalPair.html" class="extype" name="graphyx.graphics.GraphicalPair">GraphicalPair</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Scene#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Scene#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Scene#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Scene#real">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">real</span><span class="result">: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Scene#shapes">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">shapes</span><span class="result">: <span class="extype" name="scala.collection.mutable.ArrayBuffer">ArrayBuffer</span>[<a href="GraphicalShape.html" class="extype" name="graphyx.graphics.GraphicalShape">GraphicalShape</a> with <span class="extype" name="scala.Product">Product</span> {...}]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.graphics.Scene#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.graphics.Scene#world">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">world</span><span class="result">: <a href="GraphicalWorld.html" class="extype" name="graphyx.graphics.GraphicalWorld">GraphicalWorld</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.graphics.Scene#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Scene</span><span class="params">(<span name="real">real: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Scene</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/graphics/package.html b/doc/graphyx/graphics/package.html
new file mode 100644
index 0000000..b0317c0
--- /dev/null
+++ b/doc/graphyx/graphics/package.html
@@ -0,0 +1,201 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.graphics</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a></p>
+
+      <div id="definition">
+        <img src="../../lib/package_big.png" />
+        <h1>graphics</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">graphics</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        
+        
+        <div class="members" id="types">
+              <h3>Type Members</h3>
+              <ol><li name="graphyx.graphics.Drawable">
+      <h4 class="signature"><a href="Drawable.html">
+      <span class="kind">trait</span>
+      <span class="symbol">
+        <span class="name">Drawable</span><span class="result"> extends AnyRef</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">Enthaelt Methoden und Felder fuer graphische Darstellungen</p>
+    </li><li name="graphyx.graphics.GraphicalAABB">
+      <h4 class="signature"><a href="GraphicalAABB.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GraphicalAABB</span><span class="params">(<span name="real">real: AABB</span>)</span><span class="result"> extends AABB with GraphicalObject with Product</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.graphics.GraphicalBody">
+      <h4 class="signature"><a href="GraphicalBody.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GraphicalBody</span><span class="params">(<span name="real">real: Body</span>)</span><span class="result"> extends GraphicalObject with Product</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.graphics.GraphicalCircle">
+      <h4 class="signature"><a href="GraphicalCircle.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GraphicalCircle</span><span class="params">(<span name="real">real: Circle</span>)</span><span class="result"> extends Circle with GraphicalShape with Product</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.graphics.GraphicalCollision">
+      <h4 class="signature"><a href="GraphicalCollision.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GraphicalCollision</span><span class="params">(<span name="real">real: Collision</span>)</span><span class="result"> extends GraphicalObject with Product</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.graphics.GraphicalDistanceJoint">
+      <h4 class="signature"><a href="GraphicalDistanceJoint.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GraphicalDistanceJoint</span><span class="params">(<span name="real">real: DistanceJoint</span>)</span><span class="result"> extends GraphicalJoint with Product</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.graphics.GraphicalJoint">
+      <h4 class="signature"><a href="GraphicalJoint.html">
+      <span class="kind">trait</span>
+      <span class="symbol">
+        <span class="name">GraphicalJoint</span><span class="result"> extends GraphicalObject</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.graphics.GraphicalObject">
+      <h4 class="signature"><a href="GraphicalObject.html">
+      <span class="kind">trait</span>
+      <span class="symbol">
+        <span class="name">GraphicalObject</span><span class="result"> extends Drawable</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">Only copies functional info! (e</p>
+    </li><li name="graphyx.graphics.GraphicalPair">
+      <h4 class="signature"><a href="GraphicalPair.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GraphicalPair</span><span class="params">(<span name="real">real: Pair</span>)</span><span class="result"> extends GraphicalObject with Product</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.graphics.GraphicalRectangle">
+      <h4 class="signature"><a href="GraphicalRectangle.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GraphicalRectangle</span><span class="params">(<span name="real">real: Rectangle</span>)</span><span class="result"> extends Rectangle with GraphicalShape with Product</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.graphics.GraphicalRegularPolygon">
+      <h4 class="signature"><a href="GraphicalRegularPolygon.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GraphicalRegularPolygon</span><span class="params">(<span name="real">real: RegularPolygon</span>)</span><span class="result"> extends RegularPolygon with GraphicalShape with Product</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.graphics.GraphicalRevoluteJoint">
+      <h4 class="signature"><a href="GraphicalRevoluteJoint.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GraphicalRevoluteJoint</span><span class="params">(<span name="real">real: RevoluteJoint</span>)</span><span class="result"> extends GraphicalJoint with Product</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.graphics.GraphicalShape">
+      <h4 class="signature"><a href="GraphicalShape.html">
+      <span class="kind">trait</span>
+      <span class="symbol">
+        <span class="name">GraphicalShape</span><span class="result"> extends Shape with GraphicalObject</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.graphics.GraphicalSpringJoint">
+      <h4 class="signature"><a href="GraphicalSpringJoint.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GraphicalSpringJoint</span><span class="params">(<span name="real">real: SpringJoint</span>)</span><span class="result"> extends GraphicalJoint with Product</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.graphics.GraphicalWorld">
+      <h4 class="signature"><a href="GraphicalWorld.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GraphicalWorld</span><span class="params">(<span name="real">real: World</span>)</span><span class="result"> extends Product</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.graphics.MonitorResult">
+      <h4 class="signature"><a href="MonitorResult.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">MonitorResult</span><span class="result"> extends AnyRef</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.graphics.Scene">
+      <h4 class="signature"><a href="Scene.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Scene</span><span class="params">(<span name="real">real: World</span>)</span><span class="result"> extends Product</span>
+      </span>
+      </a></h4>
+      
+    </li></ol>
+            </div>
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.graphics.Parser">
+      <h4 class="signature"><a href="Parser$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Parser</span><span class="result"> extends AnyRef</span>
+      </span>
+      </a></h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/gui$content.html b/doc/graphyx/gui$content.html
deleted file mode 100644
index 433bf88..0000000
--- a/doc/graphyx/gui$content.html
+++ /dev/null
@@ -1,188 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>All classes and objects in graphyx.gui</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../script.js"></script>
-        </head>
-        <body onload="init()"><div class="page-title"><div>Simple Mechanics Simulator (SiMS) API</div></div><p><div>This document is the API specification for SiMS</div></p><table summary="" cellpadding="3" class="member">
-        <tr><td class="title" colspan="2">Class Summary</td></tr>
-        <tr>
-      <td class="modifiers" valign="top"> 
-        <code> class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/gui/AboutHelpFrame.html" target="_self">AboutHelpFrame</a></em>
-        <code> extends </code><a href="" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/gui/BodyPopup.html" target="_self">BodyPopup</a></em>
-        <code> extends </code><a href="../graphyx/gui/PopupMenu.html" target="_self">PopupMenu</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/gui/Container.html" target="_self">Container</a></em>
-        <code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/gui/ControlPanel.html" target="_self">ControlPanel</a></em>
-        (<em>container</em> : <a href="../graphyx/gui/Container.html" target="_self">Container</a>)<code> extends </code><a href="" target="contentFrame" class="scala/swing/BoxPanel">scala.swing.BoxPanel</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/gui/GrabbedBody.html" target="_self">GrabbedBody</a></em>
-        (<em>b</em> : <a href="../sims/dynamics/Body.html" target="_self">Body</a>, <em>point</em> : <a href="../sims/geometry/Vector2D.html" target="_self">Vector2D</a>)<code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/gui/GravityPanel.html" target="_self">GravityPanel</a></em>
-        (<em>container</em> : <a href="../graphyx/gui/Container.html" target="_self">Container</a>)<code> extends </code><a href="" target="contentFrame" class="scala/swing/GridBagPanel">scala.swing.GridBagPanel</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/gui/InfoPanel.html" target="_self">InfoPanel</a></em>
-        (<em>container</em> : <a href="../graphyx/gui/Container.html" target="_self">Container</a>)<code> extends </code><a href="" target="contentFrame" class="scala/swing/BoxPanel">scala.swing.BoxPanel</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/gui/MainFrame.html" target="_self">MainFrame</a></em>
-        (<em>container</em> : <a href="../graphyx/gui/Container.html" target="_self">Container</a>)<code> extends </code><a href="" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/gui/MainPanel.html" target="_self">MainPanel</a></em>
-        (<em>container</em> : <a href="../graphyx/gui/Container.html" target="_self">Container</a>)<code> extends </code><a href="" target="contentFrame" class="scala/swing/GridBagPanel">scala.swing.GridBagPanel</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/gui/MenuHelp.html" target="_self">MenuHelp</a></em>
-        <code> extends </code><a href="" target="contentFrame" class="scala/swing/Menu">scala.swing.Menu</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/gui/MenuPanel.html" target="_self">MenuPanel</a></em>
-        (<em>container</em> : <a href="../graphyx/gui/Container.html" target="_self">Container</a>)<code> extends </code><a href="" target="contentFrame" class="scala/swing/BoxPanel">scala.swing.BoxPanel</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/gui/OptionsPanel.html" target="_self">OptionsPanel</a></em>
-        (<em>container</em> : <a href="../graphyx/gui/Container.html" target="_self">Container</a>)<code> extends </code><a href="" target="contentFrame" class="scala/swing/GridPanel">scala.swing.GridPanel</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/gui/PopupMenu.html" target="_self">PopupMenu</a></em>
-        <code> extends </code><a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/gui/ShapeInfoPanel.html" target="_self">ShapeInfoPanel</a></em>
-        (<em>container</em> : <a href="../graphyx/gui/Container.html" target="_self">Container</a>)<code> extends </code><a href="" target="contentFrame" class="scala/swing/GridPanel">scala.swing.GridPanel</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/gui/WorldPanel.html" target="_self">WorldPanel</a></em>
-        (<em>container</em> : <a href="../graphyx/gui/Container.html" target="_self">Container</a>)<code> extends </code><a href="" target="contentFrame" class="scala/swing/BoxPanel">scala.swing.BoxPanel</a>
-        
-        
-      </td>
-    </tr>        
-        </table>
-<table summary="" cellpadding="3" class="member">
-        <tr><td class="title" colspan="2">Object Summary</td></tr>
-        <tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/gui/AboutHelpFrame$object.html" target="_self">AboutHelpFrame</a></em>
-        <code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        
-      </td>
-    </tr>        
-        </table></body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/gui$package.html b/doc/graphyx/gui$package.html
deleted file mode 100644
index 1d41d2c..0000000
--- a/doc/graphyx/gui$package.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>List of classes and objects in package graphyx.gui</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../script.js"></script>
-        </head>
-        <body onload="init()"><table summary="" class="navigation">
-          <tr><td class="navigation-links" valign="top">
-            <a href="../graphyx/gui$content.html" target="contentFrame">graphyx.gui</a>
-          </td></tr>
-        </table><div><div class="kinds" id="Classes">Classes</div><ul class="list">
-        <li id="Classes_A"><a href="../graphyx/gui/AboutHelpFrame.html" target="contentFrame">AboutHelpFrame</a></li>
-<li id="Classes_B"><a href="../graphyx/gui/BodyPopup.html" target="contentFrame">BodyPopup</a></li>
-<li id="Classes_C"><a href="../graphyx/gui/Container.html" target="contentFrame">Container</a></li>
-<li><a href="../graphyx/gui/ControlPanel.html" target="contentFrame">ControlPanel</a></li>
-<li id="Classes_G"><a href="../graphyx/gui/GrabbedBody.html" target="contentFrame">GrabbedBody</a></li>
-<li><a href="../graphyx/gui/GravityPanel.html" target="contentFrame">GravityPanel</a></li>
-<li id="Classes_I"><a href="../graphyx/gui/InfoPanel.html" target="contentFrame">InfoPanel</a></li>
-<li id="Classes_M"><a href="../graphyx/gui/MainFrame.html" target="contentFrame">MainFrame</a></li>
-<li><a href="../graphyx/gui/MainPanel.html" target="contentFrame">MainPanel</a></li>
-<li><a href="../graphyx/gui/MenuHelp.html" target="contentFrame">MenuHelp</a></li>
-<li><a href="../graphyx/gui/MenuPanel.html" target="contentFrame">MenuPanel</a></li>
-<li id="Classes_O"><a href="../graphyx/gui/OptionsPanel.html" target="contentFrame">OptionsPanel</a></li>
-<li id="Classes_P"><a href="../graphyx/gui/PopupMenu.html" target="contentFrame">PopupMenu</a></li>
-<li id="Classes_S"><a href="../graphyx/gui/ShapeInfoPanel.html" target="contentFrame">ShapeInfoPanel</a></li>
-<li id="Classes_W"><a href="../graphyx/gui/WorldPanel.html" target="contentFrame">WorldPanel</a></li>
-        </ul>
-<div class="kinds" id="Objects">Objects</div><ul class="list">
-        <li id="Objects_A"><a href="../graphyx/gui/AboutHelpFrame$object.html" target="contentFrame">AboutHelpFrame</a></li>
-        </ul></div></body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/gui/AboutHelpFrame$.html b/doc/graphyx/gui/AboutHelpFrame$.html
new file mode 100644
index 0000000..62ead47
--- /dev/null
+++ b/doc/graphyx/gui/AboutHelpFrame$.html
@@ -0,0 +1,156 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.gui.AboutHelpFrame</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">gui</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>AboutHelpFrame</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">AboutHelpFrame</span><span class="result"> extends AnyRef</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.gui.AboutHelpFrame#frame">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">frame</span><span class="result">: <a href="AboutHelpFrame.html" class="extype" name="graphyx.gui.AboutHelpFrame">AboutHelpFrame</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/gui/AboutHelpFrame$object.html b/doc/graphyx/gui/AboutHelpFrame$object.html
deleted file mode 100644
index 776fc9f..0000000
--- a/doc/graphyx/gui/AboutHelpFrame$object.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object AboutHelpFrame in graphyx.gui</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/gui$package.html" target="_self">graphyx.gui</a>
-        <br></br>
-        <span class="entity">object  AboutHelpFrame</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/gui/AboutHelpFrame"><code>graphyx/gui/AboutHelpFrame.scala</code></a>]
-      </div><hr></hr>
-      <a name="AboutHelpFrame"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>AboutHelpFrame</em>
-      </dt>
-      <dd><code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a></dd>
-    </dl>
-      
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/AboutHelpFrame$object.html#frame" target="_self">frame</a></em>
-         : <a href="../../graphyx/gui/AboutHelpFrame.html" target="_self">AboutHelpFrame</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="frame"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>frame</em> : <a href="../../graphyx/gui/AboutHelpFrame.html" target="_self">AboutHelpFrame</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/gui/AboutHelpFrame.html b/doc/graphyx/gui/AboutHelpFrame.html
index 5fcd3aa..097871c 100644
--- a/doc/graphyx/gui/AboutHelpFrame.html
+++ b/doc/graphyx/gui/AboutHelpFrame.html
@@ -1,138 +1,710 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class AboutHelpFrame in graphyx.gui</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.gui.AboutHelpFrame</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/gui$package.html" target="_self">graphyx.gui</a>
-        <br></br>
-        <span class="entity">class  AboutHelpFrame</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/gui/AboutHelpFrame"><code>graphyx/gui/AboutHelpFrame.scala</code></a>]
-      </div><hr></hr>
-      <a name="AboutHelpFrame"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>class</code>
-        <em>AboutHelpFrame</em>
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">gui</a></p>
 
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#peer" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.peer</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#listeners" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.listeners</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#reactions" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.reactions</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#title" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.title</a>, <a href="#title_=" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.title_=</a>, <a href="#contents_=" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.contents_=</a>, <a href="#defaultButton" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.defaultButton</a>, <a href="#defaultButton_=" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.defaultButton_=</a>, <a href="#defaultButton_=" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.defaultButton_=</a>, <a href="#dispose" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.dispose</a>, <a href="#pack" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.pack</a>, <a href="#menuBar" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.menuBar</a>, <a href="#menuBar_=" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.menuBar_=</a>, <a href="#setLocationRelativeTo" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.setLocationRelativeTo</a>, <a href="#location_=" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.location_=</a>, <a href="#iconImage" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.iconImage</a>, <a href="#iconImage_=" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.iconImage_=</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#subscribe" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.subscribe</a>, <a href="#unsubscribe" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.unsubscribe</a>, <a href="#publish" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.publish</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#listenTo" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.listenTo</a>, <a href="#deafTo" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.deafTo</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/RootPanel">scala.swing.RootPanel</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#contents" target="contentFrame" class="scala/swing/RootPanel">scala.swing.RootPanel.contents</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#self" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.self</a>, <a href="#foreground" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.foreground</a>, <a href="#foreground_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.foreground_=</a>, <a href="#background" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.background</a>, <a href="#background_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.background_=</a>, <a href="#minimumSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.minimumSize</a>, <a href="#minimumSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.minimumSize_=</a>, <a href="#maximumSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.maximumSize</a>, <a href="#maximumSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.maximumSize_=</a>, <a href="#preferredSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize</a>, <a href="#preferredSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize_=</a>, <a href="#preferredSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize_=</a>, <a href="#font" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.font</a>, <a href="#font_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.font_=</a>, <a href="#locationOnScreen" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.locationOnScreen</a>, <a href="#location" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.location</a>, <a href="#bounds" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.bounds</a>, <a href="#size" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size</a>, <a href="#size_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size_=</a>, <a href="#size_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size_=</a>, <a href="#locale" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.locale</a>, <a href="#toolkit" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.toolkit</a>, <a href="#cursor" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.cursor</a>, <a href="#cursor_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.cursor_=</a>, <a href="#visible" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.visible</a>, <a href="#visible_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.visible_=</a>, <a href="#showing" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.showing</a>, <a href="#repaint" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.repaint</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Proxy">scala.Proxy</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#hashCode" target="contentFrame" class="scala/Proxy">scala.Proxy.hashCode</a>, <a href="#equals" target="contentFrame" class="scala/Proxy">scala.Proxy.equals</a>, <a href="#toString" target="contentFrame" class="scala/Proxy">scala.Proxy.toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>AboutHelpFrame</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">AboutHelpFrame</span><span class="result"> extends <span class="extype" name="scala.swing.Frame">Frame</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.swing.Frame">Frame</li><li class="in" name="scala.swing.RichWindow">RichWindow</li><li class="in" name="scala.swing.Window">Window</li><li class="in" name="scala.swing.RootPanel">RootPanel</li><li class="in" name="scala.swing.Container">Container</li><li class="in" name="scala.swing.UIElement">UIElement</li><li class="in" name="scala.swing.LazyPublisher">LazyPublisher</li><li class="in" name="scala.swing.Publisher">Publisher</li><li class="in" name="scala.swing.Reactor">Reactor</li><li class="in" name="scala.Proxy">Proxy</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="scala.swing.UIElement#background">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">background</span><span class="result">: <span class="extype" name="java.awt.Color">Color</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#background_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">background_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Color">Color</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#bounds">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">bounds</span><span class="result">: <span class="extype" name="java.awt.Rectangle">Rectangle</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Window#centerOnScreen">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">centerOnScreen</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Window#close">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">close</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Window#closeOperation">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">closeOperation</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.RootPanel#contents">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">contents</span><span class="result">: <span class="extype" name="scala.collection.Seq">Seq</span>[<span class="extype" name="scala.swing.Component">Component</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Window#contents_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">contents_=</span><span class="params">(<span name="c">c: <span class="extype" name="scala.swing.Component">Component</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#cursor">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cursor</span><span class="result">: <span class="extype" name="java.awt.Cursor">Cursor</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#cursor_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cursor_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Cursor">Cursor</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#deafTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">deafTo</span><span class="params">(<span name="ps">ps: <span class="extype" name="scala.swing.Publisher">Publisher</span>*</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Window#defaultButton">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">defaultButton</span><span class="result">: <span class="extype" name="scala.Option">Option</span>[<span class="extype" name="scala.swing.Button">Button</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Window#defaultButton_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">defaultButton_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Option">Option</span>[<span class="extype" name="scala.swing.Button">Button</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Window#defaultButton_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">defaultButton_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.swing.Button">Button</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#displayable">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">displayable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Window#dispose">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">dispose</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="that">that: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.UIElement#font">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">font</span><span class="result">: <span class="extype" name="java.awt.Font">Font</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#font_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">font_=</span><span class="params">(<span name="f">f: <span class="extype" name="java.awt.Font">Font</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#foreground">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">foreground</span><span class="result">: <span class="extype" name="java.awt.Color">Color</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#foreground_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">foreground_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Color">Color</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.Frame#iconImage">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">iconImage</span><span class="result">: <span class="extype" name="java.awt.Image">Image</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Frame#iconImage_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">iconImage_=</span><span class="params">(<span name="i">i: <span class="extype" name="java.awt.Image">Image</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Frame#iconified">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">iconified</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Frame#iconify">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">iconify</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#ignoreRepaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">ignoreRepaint</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#ignoreRepaint_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">ignoreRepaint_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#listenTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">listenTo</span><span class="params">(<span name="ps">ps: <span class="extype" name="scala.swing.Publisher">Publisher</span>*</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#locale">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">locale</span><span class="result">: <span class="extype" name="java.util.Locale">Locale</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#location">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">location</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#locationOnScreen">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">locationOnScreen</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Window#location_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">location_=</span><span class="params">(<span name="p">p: <span class="extype" name="java.awt.Point">Point</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Frame#maximize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximize</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Frame#maximized">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximized</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#maximumSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximumSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#maximumSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximumSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.RichWindow#menuBar">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">menuBar</span><span class="result">: <span class="extype" name="scala.swing.MenuBar">MenuBar</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.RichWindow#menuBar_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">menuBar_=</span><span class="params">(<span name="m">m: <span class="extype" name="scala.swing.MenuBar">MenuBar</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#minimumSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">minimumSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#minimumSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">minimumSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#onFirstSubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">onFirstSubscribe</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#onLastUnsubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">onLastUnsubscribe</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Window#open">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">open</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Window#owner">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">owner</span><span class="result">: <span class="extype" name="scala.swing.Window">Window</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Window#pack">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">pack</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.swing.Window">Window</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Frame#peer">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">peer</span><span class="result">: <span class="extype" name="javax.swing.JFrame">JFrame</span> with <span class="extype" name="scala.swing.RichWindow.InterfaceMixin">InterfaceMixin</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize_=</span><span class="params">(<span name="xy">xy: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Publisher#publish">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">publish</span><span class="params">(<span name="e">e: <span class="extype" name="scala.swing.event.Event">Event</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#reactions">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">reactions</span><span class="result">: <span class="extype" name="scala.swing.Reactions">Reactions</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#repaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">repaint</span><span class="params">(<span name="rect">rect: <span class="extype" name="java.awt.Rectangle">Rectangle</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#repaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">repaint</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.RichWindow#resizable">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">resizable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.RichWindow#resizable_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">resizable_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#self">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">self</span><span class="result">: <span class="extype" name="java.awt.Component">Component</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Window#setLocationRelativeTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">setLocationRelativeTo</span><span class="params">(<span name="c">c: <span class="extype" name="scala.swing.UIElement">UIElement</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#showing">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">showing</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size_=</span><span class="params">(<span name="xy">xy: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size_=</span><span class="params">(<span name="dim">dim: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LazyPublisher#subscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">subscribe</span><span class="params">(<span name="listener">listener: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.swing.event.Event">Event</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.RichWindow#title">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">title</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.RichWindow#title_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">title_=</span><span class="params">(<span name="s">s: <span class="extype" name="java.lang.String">String</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.UIElement#toolkit">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toolkit</span><span class="result">: <span class="extype" name="java.awt.Toolkit">Toolkit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Frame#uniconify">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">uniconify</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Frame#unmaximize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">unmaximize</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LazyPublisher#unsubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">unsubscribe</span><span class="params">(<span name="listener">listener: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.swing.event.Event">Event</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#visible">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">visible</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#visible_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">visible_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.gui.AboutHelpFrame#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">AboutHelpFrame</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/gui/BodyPopup.html b/doc/graphyx/gui/BodyPopup.html
index d8fb284..a557f4a 100644
--- a/doc/graphyx/gui/BodyPopup.html
+++ b/doc/graphyx/gui/BodyPopup.html
@@ -1,251 +1,726 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class BodyPopup in graphyx.gui</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.gui.BodyPopup</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/gui$package.html" target="_self">graphyx.gui</a>
-        <br></br>
-        <span class="entity">class  BodyPopup</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/gui/BodyPopup"><code>graphyx/gui/BodyPopup.scala</code></a>]
-      </div><hr></hr>
-      <a name="BodyPopup"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>class</code>
-        <em>BodyPopup</em>
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/gui/PopupMenu.html" target="_self">PopupMenu</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">gui</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/BodyPopup.html#btnClose" target="_self">btnClose</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/MenuItem">scala.swing.MenuItem</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/BodyPopup.html#chckFixed" target="_self">chckFixed</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/CheckMenuItem">scala.swing.CheckMenuItem</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/BodyPopup.html#chckMonitor" target="_self">chckMonitor</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/CheckMenuItem">scala.swing.CheckMenuItem</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../graphyx/gui/PopupMenu.html" target="_self">PopupMenu</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/gui/PopupMenu.html#peer" target="_self">peer</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#initP" target="contentFrame" class="scala/swing/Component">scala.swing.Component.initP</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#listeners" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.listeners</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#reactions" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.reactions</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/BodyPopup.html#body" target="_self">body</a></em>
-         : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/BodyPopup.html#body_%3D%28sims.dynamics.Body%29" target="_self">body_=</a></em>
-        (<em>newBody</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/gui/PopupMenu.html" target="_self">PopupMenu</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/gui/PopupMenu.html#add%28scala.swing.MenuItem%29" target="_self">add</a>, <a href="../../graphyx/gui/PopupMenu.html#setVisible%28Boolean%29" target="_self">setVisible</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#xLayoutAlignment" target="contentFrame" class="scala/swing/Component">scala.swing.Component.xLayoutAlignment</a>, <a href="#xLayoutAlignment_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.xLayoutAlignment_=</a>, <a href="#yLayoutAlignment" target="contentFrame" class="scala/swing/Component">scala.swing.Component.yLayoutAlignment</a>, <a href="#yLayoutAlignment_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.yLayoutAlignment_=</a>, <a href="#border" target="contentFrame" class="scala/swing/Component">scala.swing.Component.border</a>, <a href="#border_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.border_=</a>, <a href="#opaque" target="contentFrame" class="scala/swing/Component">scala.swing.Component.opaque</a>, <a href="#opaque_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.opaque_=</a>, <a href="#enabled" target="contentFrame" class="scala/swing/Component">scala.swing.Component.enabled</a>, <a href="#enabled_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.enabled_=</a>, <a href="#tooltip" target="contentFrame" class="scala/swing/Component">scala.swing.Component.tooltip</a>, <a href="#tooltip_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.tooltip_=</a>, <a href="#inputVerifier" target="contentFrame" class="scala/swing/Component">scala.swing.Component.inputVerifier</a>, <a href="#inputVerifier_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.inputVerifier_=</a>, <a href="#revalidate" target="contentFrame" class="scala/swing/Component">scala.swing.Component.revalidate</a>, <a href="#requestFocus" target="contentFrame" class="scala/swing/Component">scala.swing.Component.requestFocus</a>, <a href="#paintComponent" target="contentFrame" class="scala/swing/Component">scala.swing.Component.paintComponent</a>, <a href="#paint" target="contentFrame" class="scala/swing/Component">scala.swing.Component.paint</a>, <a href="#toString" target="contentFrame" class="scala/swing/Component">scala.swing.Component.toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#subscribe" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.subscribe</a>, <a href="#unsubscribe" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.unsubscribe</a>, <a href="#publish" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.publish</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#listenTo" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.listenTo</a>, <a href="#deafTo" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.deafTo</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#self" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.self</a>, <a href="#foreground" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.foreground</a>, <a href="#foreground_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.foreground_=</a>, <a href="#background" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.background</a>, <a href="#background_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.background_=</a>, <a href="#minimumSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.minimumSize</a>, <a href="#minimumSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.minimumSize_=</a>, <a href="#maximumSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.maximumSize</a>, <a href="#maximumSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.maximumSize_=</a>, <a href="#preferredSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize</a>, <a href="#preferredSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize_=</a>, <a href="#preferredSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize_=</a>, <a href="#font" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.font</a>, <a href="#font_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.font_=</a>, <a href="#locationOnScreen" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.locationOnScreen</a>, <a href="#location" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.location</a>, <a href="#bounds" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.bounds</a>, <a href="#size" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size</a>, <a href="#size_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size_=</a>, <a href="#size_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size_=</a>, <a href="#locale" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.locale</a>, <a href="#toolkit" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.toolkit</a>, <a href="#cursor" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.cursor</a>, <a href="#cursor_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.cursor_=</a>, <a href="#visible" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.visible</a>, <a href="#visible_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.visible_=</a>, <a href="#showing" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.showing</a>, <a href="#repaint" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.repaint</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Proxy">scala.Proxy</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#hashCode" target="contentFrame" class="scala/Proxy">scala.Proxy.hashCode</a>, <a href="#equals" target="contentFrame" class="scala/Proxy">scala.Proxy.equals</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>BodyPopup</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">BodyPopup</span><span class="result"> extends <a href="PopupMenu.html" class="extype" name="graphyx.gui.PopupMenu">PopupMenu</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="chckMonitor"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.gui.PopupMenu">PopupMenu</li><li class="in" name="scala.swing.Component">Component</li><li class="in" name="scala.swing.UIElement">UIElement</li><li class="in" name="scala.swing.LazyPublisher">LazyPublisher</li><li class="in" name="scala.swing.Publisher">Publisher</li><li class="in" name="scala.swing.Reactor">Reactor</li><li class="in" name="scala.Proxy">Proxy</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code></code>
-        <code>val</code>
-        <em>chckMonitor</em> : <a href="" target="contentFrame" class="scala/swing/CheckMenuItem">scala.swing.CheckMenuItem</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="chckFixed"></a><dl>
-      <dt>
         
-        <code></code>
-        <code>val</code>
-        <em>chckFixed</em> : <a href="" target="contentFrame" class="scala/swing/CheckMenuItem">scala.swing.CheckMenuItem</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="btnClose"></a><dl>
-      <dt>
         
-        <code></code>
-        <code>val</code>
-        <em>btnClose</em> : <a href="" target="contentFrame" class="scala/swing/MenuItem">scala.swing.MenuItem</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="body"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="scala.swing.Component#Mouse">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">Mouse</span><span class="result">: <span class="extype" name="scala.swing.Component.mouse">mouse</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.PopupMenu#add">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">add</span><span class="params">(<span name="item">item: <span class="extype" name="scala.swing.MenuItem">MenuItem</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#background">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">background</span><span class="result">: <span class="extype" name="java.awt.Color">Color</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#background_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">background_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Color">Color</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.BodyPopup#body">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">body</span><span class="result">: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.BodyPopup#body_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">body_=</span><span class="params">(<span name="newBody">newBody: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#border">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">border</span><span class="result">: <span class="extype" name="javax.swing.border.Border">Border</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#border_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">border_=</span><span class="params">(<span name="b">b: <span class="extype" name="javax.swing.border.Border">Border</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#bounds">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">bounds</span><span class="result">: <span class="extype" name="java.awt.Rectangle">Rectangle</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.BodyPopup#btnClose">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">btnClose</span><span class="result">: <span class="extype" name="scala.swing.MenuItem">MenuItem</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.BodyPopup#chckFixed">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">chckFixed</span><span class="result">: <span class="extype" name="scala.swing.CheckMenuItem">CheckMenuItem</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.BodyPopup#chckMonitor">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">chckMonitor</span><span class="result">: <span class="extype" name="scala.swing.CheckMenuItem">CheckMenuItem</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#cursor">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cursor</span><span class="result">: <span class="extype" name="java.awt.Cursor">Cursor</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#cursor_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cursor_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Cursor">Cursor</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#deafTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">deafTo</span><span class="params">(<span name="ps">ps: <span class="extype" name="scala.swing.Publisher">Publisher</span>*</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#displayable">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">displayable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#enabled">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">enabled</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#enabled_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">enabled_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="that">that: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.Component#focusable">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">focusable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#focusable_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">focusable_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#font">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">font</span><span class="result">: <span class="extype" name="java.awt.Font">Font</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#font_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">font_=</span><span class="params">(<span name="f">f: <span class="extype" name="java.awt.Font">Font</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#foreground">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">foreground</span><span class="result">: <span class="extype" name="java.awt.Color">Color</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#foreground_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">foreground_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Color">Color</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#hasFocus">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hasFocus</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.UIElement#ignoreRepaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">ignoreRepaint</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#ignoreRepaint_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">ignoreRepaint_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#initP">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">initP</span><span class="result">: <span class="extype" name="javax.swing.JComponent">JComponent</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#inputVerifier">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">inputVerifier</span><span class="result">: (BodyPopup.this.type) ⇒ <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#inputVerifier_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">inputVerifier_=</span><span class="params">(<span name="v">v: (BodyPopup.this.type) ⇒ <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#listenTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">listenTo</span><span class="params">(<span name="ps">ps: <span class="extype" name="scala.swing.Publisher">Publisher</span>*</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#locale">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">locale</span><span class="result">: <span class="extype" name="java.util.Locale">Locale</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#location">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">location</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#locationOnScreen">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">locationOnScreen</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#maximumSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximumSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#maximumSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximumSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#minimumSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">minimumSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#minimumSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">minimumSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#onFirstSubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">onFirstSubscribe</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#onLastUnsubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">onLastUnsubscribe</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#opaque">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">opaque</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#opaque_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">opaque_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#paint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">paint</span><span class="params">(<span name="g">g: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.PopupMenu#peer">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">peer</span><span class="result">: <span class="extype" name="javax.swing.JPopupMenu">JPopupMenu</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize_=</span><span class="params">(<span name="xy">xy: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Publisher#publish">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">publish</span><span class="params">(<span name="e">e: <span class="extype" name="scala.swing.event.Event">Event</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#reactions">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">reactions</span><span class="result">: <span class="extype" name="scala.swing.Reactions">Reactions</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#repaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">repaint</span><span class="params">(<span name="rect">rect: <span class="extype" name="java.awt.Rectangle">Rectangle</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#repaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">repaint</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#requestFocus">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">requestFocus</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#requestFocusInWindow">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">requestFocusInWindow</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#revalidate">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">revalidate</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#self">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">self</span><span class="result">: <span class="extype" name="java.awt.Component">Component</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.PopupMenu#setVisible">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">setVisible</span><span class="params">(<span name="visible">visible: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#showing">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">showing</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size_=</span><span class="params">(<span name="xy">xy: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size_=</span><span class="params">(<span name="dim">dim: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LazyPublisher#subscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">subscribe</span><span class="params">(<span name="listener">listener: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.swing.event.Event">Event</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Component ⇐ Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.UIElement#toolkit">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toolkit</span><span class="result">: <span class="extype" name="java.awt.Toolkit">Toolkit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#tooltip">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">tooltip</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#tooltip_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">tooltip_=</span><span class="params">(<span name="t">t: <span class="extype" name="java.lang.String">String</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LazyPublisher#unsubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">unsubscribe</span><span class="params">(<span name="listener">listener: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.swing.event.Event">Event</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#visible">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">visible</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#visible_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">visible_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#xLayoutAlignment">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">xLayoutAlignment</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#xLayoutAlignment_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">xLayoutAlignment_=</span><span class="params">(<span name="x">x: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#yLayoutAlignment">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">yLayoutAlignment</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#yLayoutAlignment_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">yLayoutAlignment_=</span><span class="params">(<span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>body</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="body_%3D%28sims.dynamics.Body%29"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.gui.BodyPopup#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">BodyPopup</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>body_=</em>(<em>newBody</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/gui/Container.html b/doc/graphyx/gui/Container.html
index aeb0e25..feaf107 100644
--- a/doc/graphyx/gui/Container.html
+++ b/doc/graphyx/gui/Container.html
@@ -1,181 +1,199 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class Container in graphyx.gui</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.gui.Container</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/gui$package.html" target="_self">graphyx.gui</a>
-        <br></br>
-        <span class="entity">class  Container</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/gui/Container"><code>graphyx/gui/Container.scala</code></a>]
-      </div><hr></hr>
-      <a name="Container"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>class</code>
-        <em>Container</em>
-      </dt>
-      <dd><code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">gui</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/Container.html#mainFrame" target="_self">mainFrame</a></em>
-         : <a href="../../graphyx/gui/MainFrame.html" target="_self">MainFrame</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/Container.html#scene" target="_self">scene</a></em>
-         : <a href="../../graphyx/graphics/Scene.html" target="_self">Scene</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/Container.html#exitGUI%28%29" target="_self">exitGUI</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/Container.html#show%28%29" target="_self">show</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/Container.html#update%28graphyx.graphics.Scene%29" target="_self">update</a></em>
-        (<em>s</em> : <a href="../../graphyx/graphics/Scene.html" target="_self">Scene</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>Container</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Container</span><span class="result"> extends AnyRef</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="mainFrame"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>mainFrame</em> : <a href="../../graphyx/gui/MainFrame.html" target="_self">MainFrame</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="scene"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>scene</em> : <a href="../../graphyx/graphics/Scene.html" target="_self">Scene</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="show%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>show</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="update%28graphyx.graphics.Scene%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>update</em>(<em>s</em> : <a href="../../graphyx/graphics/Scene.html" target="_self">Scene</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="exitGUI%28%29"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.gui.Container#exitGUI">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">exitGUI</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.gui.Container#mainFrame">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">mainFrame</span><span class="result">: <a href="MainFrame.html" class="extype" name="graphyx.gui.MainFrame">MainFrame</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.Container#scene">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">scene</span><span class="result">: <a href="../graphics/Scene.html" class="extype" name="graphyx.graphics.Scene">Scene</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.Container#show">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">show</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.gui.Container#update">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">update</span><span class="params">(<span name="s">s: <a href="../graphics/Scene.html" class="extype" name="graphyx.graphics.Scene">Scene</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.gui.Container#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Container</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>exitGUI</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/gui/ControlPanel.html b/doc/graphyx/gui/ControlPanel.html
index 5352ba1..0c0f3bd 100644
--- a/doc/graphyx/gui/ControlPanel.html
+++ b/doc/graphyx/gui/ControlPanel.html
@@ -1,295 +1,758 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class ControlPanel in graphyx.gui</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.gui.ControlPanel</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/gui$package.html" target="_self">graphyx.gui</a>
-        <br></br>
-        <span class="entity">class  ControlPanel</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/gui/ControlPanel"><code>graphyx/gui/ControlPanel.scala</code></a>]
-      </div><hr></hr>
-      <a name="ControlPanel"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>class</code>
-        <em>ControlPanel</em>(<em>container</em> : <a href="../../graphyx/gui/Container.html" target="_self">Container</a>)
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/swing/BoxPanel">scala.swing.BoxPanel</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">gui</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/ControlPanel.html#btnExit" target="_self">btnExit</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Button">scala.swing.Button</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/ControlPanel.html#btnFire" target="_self">btnFire</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Button">scala.swing.Button</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/ControlPanel.html#btnReset" target="_self">btnReset</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Button">scala.swing.Button</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/ControlPanel.html#btnStart" target="_self">btnStart</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Button">scala.swing.Button</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/ControlPanel.html#btnStep" target="_self">btnStep</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Button">scala.swing.Button</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/ControlPanel.html#btnStop" target="_self">btnStop</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Button">scala.swing.Button</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/ControlPanel.html#cboTest" target="_self">cboTest</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/ComboBox">scala.swing.ComboBox</a>[<a href="../../graphyx/tests/Test.html" target="_self">Test</a>]
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/BoxPanel">scala.swing.BoxPanel</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#peer" target="contentFrame" class="scala/swing/BoxPanel">scala.swing.BoxPanel.peer</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/SequentialContainer/Wrapper">scala.swing.SequentialContainer.Wrapper</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#contents" target="contentFrame" class="scala/swing/SequentialContainer/Wrapper">scala.swing.SequentialContainer.Wrapper.contents</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Container/Wrapper">scala.swing.Container.Wrapper</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#_contents" target="contentFrame" class="scala/swing/Container/Wrapper">scala.swing.Container.Wrapper._contents</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#initP" target="contentFrame" class="scala/swing/Component">scala.swing.Component.initP</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#listeners" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.listeners</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#reactions" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.reactions</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#xLayoutAlignment" target="contentFrame" class="scala/swing/Component">scala.swing.Component.xLayoutAlignment</a>, <a href="#xLayoutAlignment_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.xLayoutAlignment_=</a>, <a href="#yLayoutAlignment" target="contentFrame" class="scala/swing/Component">scala.swing.Component.yLayoutAlignment</a>, <a href="#yLayoutAlignment_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.yLayoutAlignment_=</a>, <a href="#border" target="contentFrame" class="scala/swing/Component">scala.swing.Component.border</a>, <a href="#border_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.border_=</a>, <a href="#opaque" target="contentFrame" class="scala/swing/Component">scala.swing.Component.opaque</a>, <a href="#opaque_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.opaque_=</a>, <a href="#enabled" target="contentFrame" class="scala/swing/Component">scala.swing.Component.enabled</a>, <a href="#enabled_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.enabled_=</a>, <a href="#tooltip" target="contentFrame" class="scala/swing/Component">scala.swing.Component.tooltip</a>, <a href="#tooltip_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.tooltip_=</a>, <a href="#inputVerifier" target="contentFrame" class="scala/swing/Component">scala.swing.Component.inputVerifier</a>, <a href="#inputVerifier_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.inputVerifier_=</a>, <a href="#revalidate" target="contentFrame" class="scala/swing/Component">scala.swing.Component.revalidate</a>, <a href="#requestFocus" target="contentFrame" class="scala/swing/Component">scala.swing.Component.requestFocus</a>, <a href="#paintComponent" target="contentFrame" class="scala/swing/Component">scala.swing.Component.paintComponent</a>, <a href="#paint" target="contentFrame" class="scala/swing/Component">scala.swing.Component.paint</a>, <a href="#toString" target="contentFrame" class="scala/swing/Component">scala.swing.Component.toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#subscribe" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.subscribe</a>, <a href="#unsubscribe" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.unsubscribe</a>, <a href="#publish" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.publish</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#listenTo" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.listenTo</a>, <a href="#deafTo" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.deafTo</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#self" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.self</a>, <a href="#foreground" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.foreground</a>, <a href="#foreground_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.foreground_=</a>, <a href="#background" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.background</a>, <a href="#background_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.background_=</a>, <a href="#minimumSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.minimumSize</a>, <a href="#minimumSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.minimumSize_=</a>, <a href="#maximumSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.maximumSize</a>, <a href="#maximumSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.maximumSize_=</a>, <a href="#preferredSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize</a>, <a href="#preferredSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize_=</a>, <a href="#preferredSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize_=</a>, <a href="#font" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.font</a>, <a href="#font_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.font_=</a>, <a href="#locationOnScreen" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.locationOnScreen</a>, <a href="#location" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.location</a>, <a href="#bounds" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.bounds</a>, <a href="#size" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size</a>, <a href="#size_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size_=</a>, <a href="#size_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size_=</a>, <a href="#locale" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.locale</a>, <a href="#toolkit" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.toolkit</a>, <a href="#cursor" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.cursor</a>, <a href="#cursor_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.cursor_=</a>, <a href="#visible" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.visible</a>, <a href="#visible_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.visible_=</a>, <a href="#showing" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.showing</a>, <a href="#repaint" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.repaint</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Proxy">scala.Proxy</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#hashCode" target="contentFrame" class="scala/Proxy">scala.Proxy.hashCode</a>, <a href="#equals" target="contentFrame" class="scala/Proxy">scala.Proxy.equals</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>ControlPanel</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">ControlPanel</span><span class="result"> extends <span class="extype" name="scala.swing.BoxPanel">BoxPanel</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="btnStart"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>btnStart</em> : <a href="" target="contentFrame" class="scala/swing/Button">scala.swing.Button</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="btnStep"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>btnStep</em> : <a href="" target="contentFrame" class="scala/swing/Button">scala.swing.Button</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="btnStop"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.swing.BoxPanel">BoxPanel</li><li class="in" name="scala.swing.SequentialContainer.Wrapper">Wrapper</li><li class="in" name="scala.swing.SequentialContainer">SequentialContainer</li><li class="in" name="scala.swing.Panel">Panel</li><li class="in" name="scala.swing.Container.Wrapper">Wrapper</li><li class="in" name="scala.swing.Container">Container</li><li class="in" name="scala.swing.Component">Component</li><li class="in" name="scala.swing.UIElement">UIElement</li><li class="in" name="scala.swing.LazyPublisher">LazyPublisher</li><li class="in" name="scala.swing.Publisher">Publisher</li><li class="in" name="scala.swing.Reactor">Reactor</li><li class="in" name="scala.Proxy">Proxy</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code></code>
-        <code>val</code>
-        <em>btnStop</em> : <a href="" target="contentFrame" class="scala/swing/Button">scala.swing.Button</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="btnExit"></a><dl>
-      <dt>
         
-        <code></code>
-        <code>val</code>
-        <em>btnExit</em> : <a href="" target="contentFrame" class="scala/swing/Button">scala.swing.Button</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="btnFire"></a><dl>
-      <dt>
         
-        <code></code>
-        <code>val</code>
-        <em>btnFire</em> : <a href="" target="contentFrame" class="scala/swing/Button">scala.swing.Button</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="btnReset"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="scala.swing.Component#Mouse">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">Mouse</span><span class="result">: <span class="extype" name="scala.swing.Component.mouse">mouse</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#background">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">background</span><span class="result">: <span class="extype" name="java.awt.Color">Color</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#background_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">background_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Color">Color</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#border">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">border</span><span class="result">: <span class="extype" name="javax.swing.border.Border">Border</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#border_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">border_=</span><span class="params">(<span name="b">b: <span class="extype" name="javax.swing.border.Border">Border</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#bounds">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">bounds</span><span class="result">: <span class="extype" name="java.awt.Rectangle">Rectangle</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.ControlPanel#btnExit">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">btnExit</span><span class="result">: <span class="extype" name="scala.swing.Button">Button</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.ControlPanel#btnFire">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">btnFire</span><span class="result">: <span class="extype" name="scala.swing.Button">Button</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.ControlPanel#btnReset">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">btnReset</span><span class="result">: <span class="extype" name="scala.swing.Button">Button</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.ControlPanel#btnStart">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">btnStart</span><span class="result">: <span class="extype" name="scala.swing.Button">Button</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.ControlPanel#btnStep">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">btnStep</span><span class="result">: <span class="extype" name="scala.swing.Button">Button</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.ControlPanel#btnStop">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">btnStop</span><span class="result">: <span class="extype" name="scala.swing.Button">Button</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.ControlPanel#cboTest">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">cboTest</span><span class="result">: <span class="extype" name="scala.swing.ComboBox">ComboBox</span>[<a href="../tests/Test.html" class="extype" name="graphyx.tests.Test">Test</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.SequentialContainer.Wrapper#contents">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">contents</span><span class="result">: <span class="extype" name="scala.collection.mutable.Buffer">Buffer</span>[<span class="extype" name="scala.swing.Component">Component</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#cursor">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cursor</span><span class="result">: <span class="extype" name="java.awt.Cursor">Cursor</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#cursor_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cursor_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Cursor">Cursor</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#deafTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">deafTo</span><span class="params">(<span name="ps">ps: <span class="extype" name="scala.swing.Publisher">Publisher</span>*</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#displayable">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">displayable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#enabled">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">enabled</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#enabled_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">enabled_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="that">that: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.Component#focusable">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">focusable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#focusable_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">focusable_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#font">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">font</span><span class="result">: <span class="extype" name="java.awt.Font">Font</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#font_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">font_=</span><span class="params">(<span name="f">f: <span class="extype" name="java.awt.Font">Font</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#foreground">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">foreground</span><span class="result">: <span class="extype" name="java.awt.Color">Color</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#foreground_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">foreground_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Color">Color</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#hasFocus">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hasFocus</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.UIElement#ignoreRepaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">ignoreRepaint</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#ignoreRepaint_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">ignoreRepaint_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#initP">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">initP</span><span class="result">: <span class="extype" name="javax.swing.JComponent">JComponent</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#inputVerifier">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">inputVerifier</span><span class="result">: (ControlPanel.this.type) ⇒ <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#inputVerifier_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">inputVerifier_=</span><span class="params">(<span name="v">v: (ControlPanel.this.type) ⇒ <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#listenTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">listenTo</span><span class="params">(<span name="ps">ps: <span class="extype" name="scala.swing.Publisher">Publisher</span>*</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#locale">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">locale</span><span class="result">: <span class="extype" name="java.util.Locale">Locale</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#location">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">location</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#locationOnScreen">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">locationOnScreen</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#maximumSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximumSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#maximumSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximumSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#minimumSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">minimumSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#minimumSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">minimumSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#onFirstSubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">onFirstSubscribe</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#onLastUnsubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">onLastUnsubscribe</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#opaque">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">opaque</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#opaque_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">opaque_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#paint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">paint</span><span class="params">(<span name="g">g: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.BoxPanel#peer">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">peer</span><span class="result">: <span class="extype" name="javax.swing.JPanel">JPanel</span> with <span class="extype" name="scala.swing.Component.SuperMixin">SuperMixin</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize_=</span><span class="params">(<span name="xy">xy: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Publisher#publish">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">publish</span><span class="params">(<span name="e">e: <span class="extype" name="scala.swing.event.Event">Event</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#reactions">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">reactions</span><span class="result">: <span class="extype" name="scala.swing.Reactions">Reactions</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#repaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">repaint</span><span class="params">(<span name="rect">rect: <span class="extype" name="java.awt.Rectangle">Rectangle</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#repaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">repaint</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#requestFocus">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">requestFocus</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#requestFocusInWindow">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">requestFocusInWindow</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#revalidate">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">revalidate</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#self">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">self</span><span class="result">: <span class="extype" name="java.awt.Component">Component</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#showing">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">showing</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size_=</span><span class="params">(<span name="xy">xy: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size_=</span><span class="params">(<span name="dim">dim: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LazyPublisher#subscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">subscribe</span><span class="params">(<span name="listener">listener: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.swing.event.Event">Event</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Component ⇐ Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.UIElement#toolkit">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toolkit</span><span class="result">: <span class="extype" name="java.awt.Toolkit">Toolkit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#tooltip">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">tooltip</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#tooltip_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">tooltip_=</span><span class="params">(<span name="t">t: <span class="extype" name="java.lang.String">String</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LazyPublisher#unsubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">unsubscribe</span><span class="params">(<span name="listener">listener: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.swing.event.Event">Event</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.ControlPanel#update">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">update</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#visible">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">visible</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#visible_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">visible_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#xLayoutAlignment">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">xLayoutAlignment</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#xLayoutAlignment_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">xLayoutAlignment_=</span><span class="params">(<span name="x">x: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#yLayoutAlignment">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">yLayoutAlignment</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#yLayoutAlignment_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">yLayoutAlignment_=</span><span class="params">(<span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>val</code>
-        <em>btnReset</em> : <a href="" target="contentFrame" class="scala/swing/Button">scala.swing.Button</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="cboTest"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.gui.ControlPanel#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">ControlPanel</span><span class="params">(<span name="container">container: <a href="Container.html" class="extype" name="graphyx.gui.Container">Container</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.BoxPanel#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">ControlPanel</span><span class="params">(<span name="orientation">orientation: <span class="extype" name="scala.Enumeration.Value">Value</span></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Panel#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">ControlPanel</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>val</code>
-        <em>cboTest</em> : <a href="" target="contentFrame" class="scala/swing/ComboBox">scala.swing.ComboBox</a>[<a href="../../graphyx/tests/Test.html" target="_self">Test</a>]
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/gui/GrabbedBody.html b/doc/graphyx/gui/GrabbedBody.html
index 4d9f028..ac2091e 100644
--- a/doc/graphyx/gui/GrabbedBody.html
+++ b/doc/graphyx/gui/GrabbedBody.html
@@ -1,141 +1,191 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class GrabbedBody in graphyx.gui</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.gui.GrabbedBody</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/gui$package.html" target="_self">graphyx.gui</a>
-        <br></br>
-        <span class="entity">class  GrabbedBody</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/gui/GrabbedBody"><code>graphyx/gui/GrabbedBody.scala</code></a>]
-      </div><hr></hr>
-      <a name="GrabbedBody"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>class</code>
-        <em>GrabbedBody</em>(<em>b</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>, <em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>)
-      </dt>
-      <dd><code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">gui</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/GrabbedBody.html#r" target="_self">r</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/GrabbedBody.html#wasFixed" target="_self">wasFixed</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>GrabbedBody</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GrabbedBody</span><span class="result"> extends AnyRef</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/GrabbedBody.html#body" target="_self">body</a></em>
-         : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
         
         
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.gui.GrabbedBody#body">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">body</span><span class="result">: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="r"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>r</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="wasFixed"></a><dl>
-      <dt>
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.gui.GrabbedBody#r">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">r</span><span class="result">: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.gui.GrabbedBody#wasFixed">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">wasFixed</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>val</code>
-        <em>wasFixed</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="body"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.gui.GrabbedBody#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GrabbedBody</span><span class="params">(<span name="b">b: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="point">point: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GrabbedBody</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>body</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/gui/GravityPanel.html b/doc/graphyx/gui/GravityPanel.html
index ca9b299..140b3a0 100644
--- a/doc/graphyx/gui/GravityPanel.html
+++ b/doc/graphyx/gui/GravityPanel.html
@@ -1,292 +1,750 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class GravityPanel in graphyx.gui</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.gui.GravityPanel</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/gui$package.html" target="_self">graphyx.gui</a>
-        <br></br>
-        <span class="entity">class  GravityPanel</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/gui/GravityPanel"><code>graphyx/gui/GravityPanel.scala</code></a>]
-      </div><hr></hr>
-      <a name="GravityPanel"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>class</code>
-        <em>GravityPanel</em>(<em>container</em> : <a href="../../graphyx/gui/Container.html" target="_self">Container</a>)
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/swing/GridBagPanel">scala.swing.GridBagPanel</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">gui</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/GravityPanel.html#c" target="_self">c</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/GridBagPanel/Constraints">scala.swing.GridBagPanel.Constraints</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/GravityPanel.html#lblX" target="_self">lblX</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/GravityPanel.html#lblY" target="_self">lblY</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/GravityPanel.html#sldX" target="_self">sldX</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Slider">scala.swing.Slider</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/GravityPanel.html#sldY" target="_self">sldY</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Slider">scala.swing.Slider</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/GridBagPanel">scala.swing.GridBagPanel</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#peer" target="contentFrame" class="scala/swing/GridBagPanel">scala.swing.GridBagPanel.peer</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Container/Wrapper">scala.swing.Container.Wrapper</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#_contents" target="contentFrame" class="scala/swing/Container/Wrapper">scala.swing.Container.Wrapper._contents</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#initP" target="contentFrame" class="scala/swing/Component">scala.swing.Component.initP</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#listeners" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.listeners</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#reactions" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.reactions</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/GravityPanel.html#update%28%29" target="_self">update</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/GridBagPanel">scala.swing.GridBagPanel</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#pair2Constraints" target="contentFrame" class="scala/swing/GridBagPanel">scala.swing.GridBagPanel.pair2Constraints</a>, <a href="#constraintsFor" target="contentFrame" class="scala/swing/GridBagPanel">scala.swing.GridBagPanel.constraintsFor</a>, <a href="#areValid" target="contentFrame" class="scala/swing/GridBagPanel">scala.swing.GridBagPanel.areValid</a>, <a href="#add" target="contentFrame" class="scala/swing/GridBagPanel">scala.swing.GridBagPanel.add</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/LayoutContainer">scala.swing.LayoutContainer</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#layout" target="contentFrame" class="scala/swing/LayoutContainer">scala.swing.LayoutContainer.layout</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Container/Wrapper">scala.swing.Container.Wrapper</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#contents" target="contentFrame" class="scala/swing/Container/Wrapper">scala.swing.Container.Wrapper.contents</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#xLayoutAlignment" target="contentFrame" class="scala/swing/Component">scala.swing.Component.xLayoutAlignment</a>, <a href="#xLayoutAlignment_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.xLayoutAlignment_=</a>, <a href="#yLayoutAlignment" target="contentFrame" class="scala/swing/Component">scala.swing.Component.yLayoutAlignment</a>, <a href="#yLayoutAlignment_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.yLayoutAlignment_=</a>, <a href="#border" target="contentFrame" class="scala/swing/Component">scala.swing.Component.border</a>, <a href="#border_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.border_=</a>, <a href="#opaque" target="contentFrame" class="scala/swing/Component">scala.swing.Component.opaque</a>, <a href="#opaque_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.opaque_=</a>, <a href="#enabled" target="contentFrame" class="scala/swing/Component">scala.swing.Component.enabled</a>, <a href="#enabled_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.enabled_=</a>, <a href="#tooltip" target="contentFrame" class="scala/swing/Component">scala.swing.Component.tooltip</a>, <a href="#tooltip_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.tooltip_=</a>, <a href="#inputVerifier" target="contentFrame" class="scala/swing/Component">scala.swing.Component.inputVerifier</a>, <a href="#inputVerifier_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.inputVerifier_=</a>, <a href="#revalidate" target="contentFrame" class="scala/swing/Component">scala.swing.Component.revalidate</a>, <a href="#requestFocus" target="contentFrame" class="scala/swing/Component">scala.swing.Component.requestFocus</a>, <a href="#paintComponent" target="contentFrame" class="scala/swing/Component">scala.swing.Component.paintComponent</a>, <a href="#paint" target="contentFrame" class="scala/swing/Component">scala.swing.Component.paint</a>, <a href="#toString" target="contentFrame" class="scala/swing/Component">scala.swing.Component.toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#subscribe" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.subscribe</a>, <a href="#unsubscribe" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.unsubscribe</a>, <a href="#publish" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.publish</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#listenTo" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.listenTo</a>, <a href="#deafTo" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.deafTo</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#self" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.self</a>, <a href="#foreground" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.foreground</a>, <a href="#foreground_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.foreground_=</a>, <a href="#background" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.background</a>, <a href="#background_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.background_=</a>, <a href="#minimumSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.minimumSize</a>, <a href="#minimumSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.minimumSize_=</a>, <a href="#maximumSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.maximumSize</a>, <a href="#maximumSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.maximumSize_=</a>, <a href="#preferredSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize</a>, <a href="#preferredSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize_=</a>, <a href="#preferredSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize_=</a>, <a href="#font" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.font</a>, <a href="#font_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.font_=</a>, <a href="#locationOnScreen" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.locationOnScreen</a>, <a href="#location" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.location</a>, <a href="#bounds" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.bounds</a>, <a href="#size" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size</a>, <a href="#size_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size_=</a>, <a href="#size_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size_=</a>, <a href="#locale" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.locale</a>, <a href="#toolkit" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.toolkit</a>, <a href="#cursor" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.cursor</a>, <a href="#cursor_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.cursor_=</a>, <a href="#visible" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.visible</a>, <a href="#visible_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.visible_=</a>, <a href="#showing" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.showing</a>, <a href="#repaint" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.repaint</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Proxy">scala.Proxy</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#hashCode" target="contentFrame" class="scala/Proxy">scala.Proxy.hashCode</a>, <a href="#equals" target="contentFrame" class="scala/Proxy">scala.Proxy.equals</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>GravityPanel</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GravityPanel</span><span class="result"> extends <span class="extype" name="scala.swing.GridBagPanel">GridBagPanel</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="c"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>c</em> : <a href="" target="contentFrame" class="scala/swing/GridBagPanel/Constraints">scala.swing.GridBagPanel.Constraints</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="sldX"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.swing.GridBagPanel">GridBagPanel</li><li class="in" name="scala.swing.LayoutContainer">LayoutContainer</li><li class="in" name="scala.swing.Panel">Panel</li><li class="in" name="scala.swing.Container.Wrapper">Wrapper</li><li class="in" name="scala.swing.Container">Container</li><li class="in" name="scala.swing.Component">Component</li><li class="in" name="scala.swing.UIElement">UIElement</li><li class="in" name="scala.swing.LazyPublisher">LazyPublisher</li><li class="in" name="scala.swing.Publisher">Publisher</li><li class="in" name="scala.swing.Reactor">Reactor</li><li class="in" name="scala.Proxy">Proxy</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code></code>
-        <code>val</code>
-        <em>sldX</em> : <a href="" target="contentFrame" class="scala/swing/Slider">scala.swing.Slider</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="lblX"></a><dl>
-      <dt>
         
-        <code></code>
-        <code>val</code>
-        <em>lblX</em> : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="sldY"></a><dl>
-      <dt>
         
-        <code></code>
-        <code>val</code>
-        <em>sldY</em> : <a href="" target="contentFrame" class="scala/swing/Slider">scala.swing.Slider</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="lblY"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="scala.swing.Component#Mouse">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">Mouse</span><span class="result">: <span class="extype" name="scala.swing.Component.mouse">mouse</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#background">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">background</span><span class="result">: <span class="extype" name="java.awt.Color">Color</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#background_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">background_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Color">Color</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#border">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">border</span><span class="result">: <span class="extype" name="javax.swing.border.Border">Border</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#border_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">border_=</span><span class="params">(<span name="b">b: <span class="extype" name="javax.swing.border.Border">Border</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#bounds">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">bounds</span><span class="result">: <span class="extype" name="java.awt.Rectangle">Rectangle</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.GravityPanel#c">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">c</span><span class="result">: <span class="extype" name="scala.swing.GridBagPanel.Constraints">Constraints</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Container.Wrapper#contents">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">contents</span><span class="result">: <span class="extype" name="scala.collection.Seq">Seq</span>[<span class="extype" name="scala.swing.Component">Component</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#cursor">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cursor</span><span class="result">: <span class="extype" name="java.awt.Cursor">Cursor</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#cursor_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cursor_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Cursor">Cursor</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#deafTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">deafTo</span><span class="params">(<span name="ps">ps: <span class="extype" name="scala.swing.Publisher">Publisher</span>*</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#displayable">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">displayable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#enabled">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">enabled</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#enabled_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">enabled_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="that">that: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.Component#focusable">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">focusable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#focusable_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">focusable_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#font">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">font</span><span class="result">: <span class="extype" name="java.awt.Font">Font</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#font_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">font_=</span><span class="params">(<span name="f">f: <span class="extype" name="java.awt.Font">Font</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#foreground">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">foreground</span><span class="result">: <span class="extype" name="java.awt.Color">Color</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#foreground_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">foreground_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Color">Color</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#hasFocus">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hasFocus</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.UIElement#ignoreRepaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">ignoreRepaint</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#ignoreRepaint_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">ignoreRepaint_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#initP">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">initP</span><span class="result">: <span class="extype" name="javax.swing.JComponent">JComponent</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#inputVerifier">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">inputVerifier</span><span class="result">: (GravityPanel.this.type) ⇒ <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#inputVerifier_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">inputVerifier_=</span><span class="params">(<span name="v">v: (GravityPanel.this.type) ⇒ <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LayoutContainer#layout">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">layout</span><span class="result">: <span class="extype" name="scala.collection.mutable.Map">Map</span>[<span class="extype" name="scala.swing.Component">Component</span>, <span class="extype" name="scala.swing.GridBagPanel.Constraints">Constraints</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.GravityPanel#lblX">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">lblX</span><span class="result">: <span class="extype" name="scala.swing.Label">Label</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.GravityPanel#lblY">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">lblY</span><span class="result">: <span class="extype" name="scala.swing.Label">Label</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#listenTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">listenTo</span><span class="params">(<span name="ps">ps: <span class="extype" name="scala.swing.Publisher">Publisher</span>*</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#locale">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">locale</span><span class="result">: <span class="extype" name="java.util.Locale">Locale</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#location">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">location</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#locationOnScreen">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">locationOnScreen</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#maximumSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximumSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#maximumSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximumSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#minimumSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">minimumSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#minimumSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">minimumSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#onFirstSubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">onFirstSubscribe</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#onLastUnsubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">onLastUnsubscribe</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#opaque">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">opaque</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#opaque_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">opaque_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#paint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">paint</span><span class="params">(<span name="g">g: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.GridBagPanel#pair2Constraints">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">pair2Constraints</span><span class="params">(<span name="p">p: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.swing.GridBagPanel.Constraints">Constraints</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.GridBagPanel#peer">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">peer</span><span class="result">: <span class="extype" name="javax.swing.JPanel">JPanel</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize_=</span><span class="params">(<span name="xy">xy: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Publisher#publish">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">publish</span><span class="params">(<span name="e">e: <span class="extype" name="scala.swing.event.Event">Event</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#reactions">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">reactions</span><span class="result">: <span class="extype" name="scala.swing.Reactions">Reactions</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#repaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">repaint</span><span class="params">(<span name="rect">rect: <span class="extype" name="java.awt.Rectangle">Rectangle</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#repaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">repaint</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#requestFocus">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">requestFocus</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#requestFocusInWindow">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">requestFocusInWindow</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#revalidate">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">revalidate</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#self">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">self</span><span class="result">: <span class="extype" name="java.awt.Component">Component</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#showing">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">showing</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size_=</span><span class="params">(<span name="xy">xy: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size_=</span><span class="params">(<span name="dim">dim: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.GravityPanel#sldX">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">sldX</span><span class="result">: <span class="extype" name="scala.swing.Slider">Slider</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.GravityPanel#sldY">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">sldY</span><span class="result">: <span class="extype" name="scala.swing.Slider">Slider</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LazyPublisher#subscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">subscribe</span><span class="params">(<span name="listener">listener: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.swing.event.Event">Event</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Component ⇐ Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.UIElement#toolkit">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toolkit</span><span class="result">: <span class="extype" name="java.awt.Toolkit">Toolkit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#tooltip">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">tooltip</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#tooltip_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">tooltip_=</span><span class="params">(<span name="t">t: <span class="extype" name="java.lang.String">String</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LazyPublisher#unsubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">unsubscribe</span><span class="params">(<span name="listener">listener: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.swing.event.Event">Event</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.GravityPanel#update">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">update</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#visible">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">visible</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#visible_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">visible_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#xLayoutAlignment">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">xLayoutAlignment</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#xLayoutAlignment_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">xLayoutAlignment_=</span><span class="params">(<span name="x">x: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#yLayoutAlignment">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">yLayoutAlignment</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#yLayoutAlignment_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">yLayoutAlignment_=</span><span class="params">(<span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>val</code>
-        <em>lblY</em> : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="update%28%29"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.gui.GravityPanel#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GravityPanel</span><span class="params">(<span name="container">container: <a href="Container.html" class="extype" name="graphyx.gui.Container">Container</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.GridBagPanel#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GravityPanel</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>update</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/gui/InfoPanel.html b/doc/graphyx/gui/InfoPanel.html
index 94dd11f..c4f43c0 100644
--- a/doc/graphyx/gui/InfoPanel.html
+++ b/doc/graphyx/gui/InfoPanel.html
@@ -1,198 +1,710 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class InfoPanel in graphyx.gui</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.gui.InfoPanel</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/gui$package.html" target="_self">graphyx.gui</a>
-        <br></br>
-        <span class="entity">class  InfoPanel</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/gui/InfoPanel"><code>graphyx/gui/InfoPanel.scala</code></a>]
-      </div><hr></hr>
-      <a name="InfoPanel"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>class</code>
-        <em>InfoPanel</em>(<em>container</em> : <a href="../../graphyx/gui/Container.html" target="_self">Container</a>)
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/swing/BoxPanel">scala.swing.BoxPanel</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">gui</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/InfoPanel.html#out" target="_self">out</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/TextArea">scala.swing.TextArea</a>
-        
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>InfoPanel</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">InfoPanel</span><span class="result"> extends <span class="extype" name="scala.swing.BoxPanel">BoxPanel</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.swing.BoxPanel">BoxPanel</li><li class="in" name="scala.swing.SequentialContainer.Wrapper">Wrapper</li><li class="in" name="scala.swing.SequentialContainer">SequentialContainer</li><li class="in" name="scala.swing.Panel">Panel</li><li class="in" name="scala.swing.Container.Wrapper">Wrapper</li><li class="in" name="scala.swing.Container">Container</li><li class="in" name="scala.swing.Component">Component</li><li class="in" name="scala.swing.UIElement">UIElement</li><li class="in" name="scala.swing.LazyPublisher">LazyPublisher</li><li class="in" name="scala.swing.Publisher">Publisher</li><li class="in" name="scala.swing.Reactor">Reactor</li><li class="in" name="scala.Proxy">Proxy</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/BoxPanel">scala.swing.BoxPanel</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#peer" target="contentFrame" class="scala/swing/BoxPanel">scala.swing.BoxPanel.peer</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/SequentialContainer/Wrapper">scala.swing.SequentialContainer.Wrapper</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#contents" target="contentFrame" class="scala/swing/SequentialContainer/Wrapper">scala.swing.SequentialContainer.Wrapper.contents</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Container/Wrapper">scala.swing.Container.Wrapper</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#_contents" target="contentFrame" class="scala/swing/Container/Wrapper">scala.swing.Container.Wrapper._contents</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#initP" target="contentFrame" class="scala/swing/Component">scala.swing.Component.initP</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#listeners" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.listeners</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#reactions" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.reactions</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/InfoPanel.html#update%28%29" target="_self">update</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
         
         
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#xLayoutAlignment" target="contentFrame" class="scala/swing/Component">scala.swing.Component.xLayoutAlignment</a>, <a href="#xLayoutAlignment_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.xLayoutAlignment_=</a>, <a href="#yLayoutAlignment" target="contentFrame" class="scala/swing/Component">scala.swing.Component.yLayoutAlignment</a>, <a href="#yLayoutAlignment_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.yLayoutAlignment_=</a>, <a href="#border" target="contentFrame" class="scala/swing/Component">scala.swing.Component.border</a>, <a href="#border_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.border_=</a>, <a href="#opaque" target="contentFrame" class="scala/swing/Component">scala.swing.Component.opaque</a>, <a href="#opaque_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.opaque_=</a>, <a href="#enabled" target="contentFrame" class="scala/swing/Component">scala.swing.Component.enabled</a>, <a href="#enabled_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.enabled_=</a>, <a href="#tooltip" target="contentFrame" class="scala/swing/Component">scala.swing.Component.tooltip</a>, <a href="#tooltip_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.tooltip_=</a>, <a href="#inputVerifier" target="contentFrame" class="scala/swing/Component">scala.swing.Component.inputVerifier</a>, <a href="#inputVerifier_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.inputVerifier_=</a>, <a href="#revalidate" target="contentFrame" class="scala/swing/Component">scala.swing.Component.revalidate</a>, <a href="#requestFocus" target="contentFrame" class="scala/swing/Component">scala.swing.Component.requestFocus</a>, <a href="#paintComponent" target="contentFrame" class="scala/swing/Component">scala.swing.Component.paintComponent</a>, <a href="#paint" target="contentFrame" class="scala/swing/Component">scala.swing.Component.paint</a>, <a href="#toString" target="contentFrame" class="scala/swing/Component">scala.swing.Component.toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#subscribe" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.subscribe</a>, <a href="#unsubscribe" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.unsubscribe</a>, <a href="#publish" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.publish</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#listenTo" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.listenTo</a>, <a href="#deafTo" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.deafTo</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#self" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.self</a>, <a href="#foreground" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.foreground</a>, <a href="#foreground_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.foreground_=</a>, <a href="#background" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.background</a>, <a href="#background_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.background_=</a>, <a href="#minimumSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.minimumSize</a>, <a href="#minimumSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.minimumSize_=</a>, <a href="#maximumSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.maximumSize</a>, <a href="#maximumSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.maximumSize_=</a>, <a href="#preferredSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize</a>, <a href="#preferredSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize_=</a>, <a href="#preferredSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize_=</a>, <a href="#font" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.font</a>, <a href="#font_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.font_=</a>, <a href="#locationOnScreen" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.locationOnScreen</a>, <a href="#location" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.location</a>, <a href="#bounds" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.bounds</a>, <a href="#size" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size</a>, <a href="#size_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size_=</a>, <a href="#size_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size_=</a>, <a href="#locale" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.locale</a>, <a href="#toolkit" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.toolkit</a>, <a href="#cursor" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.cursor</a>, <a href="#cursor_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.cursor_=</a>, <a href="#visible" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.visible</a>, <a href="#visible_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.visible_=</a>, <a href="#showing" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.showing</a>, <a href="#repaint" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.repaint</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Proxy">scala.Proxy</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#hashCode" target="contentFrame" class="scala/Proxy">scala.Proxy.hashCode</a>, <a href="#equals" target="contentFrame" class="scala/Proxy">scala.Proxy.equals</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="scala.swing.Component#Mouse">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">Mouse</span><span class="result">: <span class="extype" name="scala.swing.Component.mouse">mouse</span></span>
+      </span>
+      </h4>
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="out"></a><dl>
-      <dt>
+    </li><li name="scala.swing.UIElement#background">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">background</span><span class="result">: <span class="extype" name="java.awt.Color">Color</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#background_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">background_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Color">Color</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#border">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">border</span><span class="result">: <span class="extype" name="javax.swing.border.Border">Border</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#border_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">border_=</span><span class="params">(<span name="b">b: <span class="extype" name="javax.swing.border.Border">Border</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#bounds">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">bounds</span><span class="result">: <span class="extype" name="java.awt.Rectangle">Rectangle</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.SequentialContainer.Wrapper#contents">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">contents</span><span class="result">: <span class="extype" name="scala.collection.mutable.Buffer">Buffer</span>[<span class="extype" name="scala.swing.Component">Component</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#cursor">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cursor</span><span class="result">: <span class="extype" name="java.awt.Cursor">Cursor</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#cursor_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cursor_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Cursor">Cursor</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#deafTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">deafTo</span><span class="params">(<span name="ps">ps: <span class="extype" name="scala.swing.Publisher">Publisher</span>*</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#displayable">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">displayable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#enabled">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">enabled</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#enabled_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">enabled_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="that">that: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.Component#focusable">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">focusable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#focusable_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">focusable_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#font">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">font</span><span class="result">: <span class="extype" name="java.awt.Font">Font</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#font_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">font_=</span><span class="params">(<span name="f">f: <span class="extype" name="java.awt.Font">Font</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#foreground">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">foreground</span><span class="result">: <span class="extype" name="java.awt.Color">Color</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#foreground_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">foreground_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Color">Color</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#hasFocus">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hasFocus</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.UIElement#ignoreRepaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">ignoreRepaint</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#ignoreRepaint_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">ignoreRepaint_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#initP">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">initP</span><span class="result">: <span class="extype" name="javax.swing.JComponent">JComponent</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#inputVerifier">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">inputVerifier</span><span class="result">: (InfoPanel.this.type) ⇒ <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#inputVerifier_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">inputVerifier_=</span><span class="params">(<span name="v">v: (InfoPanel.this.type) ⇒ <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#listenTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">listenTo</span><span class="params">(<span name="ps">ps: <span class="extype" name="scala.swing.Publisher">Publisher</span>*</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#locale">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">locale</span><span class="result">: <span class="extype" name="java.util.Locale">Locale</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#location">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">location</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#locationOnScreen">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">locationOnScreen</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#maximumSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximumSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#maximumSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximumSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#minimumSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">minimumSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#minimumSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">minimumSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#onFirstSubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">onFirstSubscribe</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#onLastUnsubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">onLastUnsubscribe</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#opaque">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">opaque</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#opaque_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">opaque_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.InfoPanel#out">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">out</span><span class="result">: <span class="extype" name="scala.swing.TextArea">TextArea</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#paint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">paint</span><span class="params">(<span name="g">g: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.BoxPanel#peer">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">peer</span><span class="result">: <span class="extype" name="javax.swing.JPanel">JPanel</span> with <span class="extype" name="scala.swing.Component.SuperMixin">SuperMixin</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize_=</span><span class="params">(<span name="xy">xy: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Publisher#publish">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">publish</span><span class="params">(<span name="e">e: <span class="extype" name="scala.swing.event.Event">Event</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#reactions">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">reactions</span><span class="result">: <span class="extype" name="scala.swing.Reactions">Reactions</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#repaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">repaint</span><span class="params">(<span name="rect">rect: <span class="extype" name="java.awt.Rectangle">Rectangle</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#repaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">repaint</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#requestFocus">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">requestFocus</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#requestFocusInWindow">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">requestFocusInWindow</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#revalidate">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">revalidate</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#self">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">self</span><span class="result">: <span class="extype" name="java.awt.Component">Component</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#showing">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">showing</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size_=</span><span class="params">(<span name="xy">xy: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size_=</span><span class="params">(<span name="dim">dim: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LazyPublisher#subscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">subscribe</span><span class="params">(<span name="listener">listener: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.swing.event.Event">Event</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Component ⇐ Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.UIElement#toolkit">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toolkit</span><span class="result">: <span class="extype" name="java.awt.Toolkit">Toolkit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#tooltip">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">tooltip</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#tooltip_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">tooltip_=</span><span class="params">(<span name="t">t: <span class="extype" name="java.lang.String">String</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LazyPublisher#unsubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">unsubscribe</span><span class="params">(<span name="listener">listener: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.swing.event.Event">Event</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.InfoPanel#update">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">update</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#visible">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">visible</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#visible_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">visible_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#xLayoutAlignment">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">xLayoutAlignment</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#xLayoutAlignment_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">xLayoutAlignment_=</span><span class="params">(<span name="x">x: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#yLayoutAlignment">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">yLayoutAlignment</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#yLayoutAlignment_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">yLayoutAlignment_=</span><span class="params">(<span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>val</code>
-        <em>out</em> : <a href="" target="contentFrame" class="scala/swing/TextArea">scala.swing.TextArea</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="update%28%29"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.gui.InfoPanel#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">InfoPanel</span><span class="params">(<span name="container">container: <a href="Container.html" class="extype" name="graphyx.gui.Container">Container</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.BoxPanel#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">InfoPanel</span><span class="params">(<span name="orientation">orientation: <span class="extype" name="scala.Enumeration.Value">Value</span></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Panel#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">InfoPanel</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>update</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/gui/MainFrame.html b/doc/graphyx/gui/MainFrame.html
index fbc978a..289bd95 100644
--- a/doc/graphyx/gui/MainFrame.html
+++ b/doc/graphyx/gui/MainFrame.html
@@ -1,161 +1,726 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class MainFrame in graphyx.gui</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.gui.MainFrame</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/gui$package.html" target="_self">graphyx.gui</a>
-        <br></br>
-        <span class="entity">class  MainFrame</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/gui/MainFrame"><code>graphyx/gui/MainFrame.scala</code></a>]
-      </div><hr></hr>
-      <a name="MainFrame"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>class</code>
-        <em>MainFrame</em>(<em>container</em> : <a href="../../graphyx/gui/Container.html" target="_self">Container</a>)
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">gui</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/MainFrame.html#mainPanel" target="_self">mainPanel</a></em>
-         : <a href="../../graphyx/gui/MainPanel.html" target="_self">MainPanel</a>
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>MainFrame</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">MainFrame</span><span class="result"> extends <span class="extype" name="scala.swing.Frame">Frame</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.swing.Frame">Frame</li><li class="in" name="scala.swing.RichWindow">RichWindow</li><li class="in" name="scala.swing.Window">Window</li><li class="in" name="scala.swing.RootPanel">RootPanel</li><li class="in" name="scala.swing.Container">Container</li><li class="in" name="scala.swing.UIElement">UIElement</li><li class="in" name="scala.swing.LazyPublisher">LazyPublisher</li><li class="in" name="scala.swing.Publisher">Publisher</li><li class="in" name="scala.swing.Reactor">Reactor</li><li class="in" name="scala.Proxy">Proxy</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
         
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#peer" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.peer</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#listeners" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.listeners</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#reactions" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.reactions</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#title" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.title</a>, <a href="#title_=" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.title_=</a>, <a href="#contents_=" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.contents_=</a>, <a href="#defaultButton" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.defaultButton</a>, <a href="#defaultButton_=" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.defaultButton_=</a>, <a href="#defaultButton_=" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.defaultButton_=</a>, <a href="#dispose" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.dispose</a>, <a href="#pack" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.pack</a>, <a href="#menuBar" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.menuBar</a>, <a href="#menuBar_=" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.menuBar_=</a>, <a href="#setLocationRelativeTo" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.setLocationRelativeTo</a>, <a href="#location_=" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.location_=</a>, <a href="#iconImage" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.iconImage</a>, <a href="#iconImage_=" target="contentFrame" class="scala/swing/Frame">scala.swing.Frame.iconImage_=</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#subscribe" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.subscribe</a>, <a href="#unsubscribe" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.unsubscribe</a>, <a href="#publish" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.publish</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#listenTo" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.listenTo</a>, <a href="#deafTo" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.deafTo</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/RootPanel">scala.swing.RootPanel</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#contents" target="contentFrame" class="scala/swing/RootPanel">scala.swing.RootPanel.contents</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#self" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.self</a>, <a href="#foreground" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.foreground</a>, <a href="#foreground_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.foreground_=</a>, <a href="#background" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.background</a>, <a href="#background_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.background_=</a>, <a href="#minimumSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.minimumSize</a>, <a href="#minimumSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.minimumSize_=</a>, <a href="#maximumSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.maximumSize</a>, <a href="#maximumSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.maximumSize_=</a>, <a href="#preferredSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize</a>, <a href="#preferredSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize_=</a>, <a href="#preferredSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize_=</a>, <a href="#font" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.font</a>, <a href="#font_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.font_=</a>, <a href="#locationOnScreen" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.locationOnScreen</a>, <a href="#location" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.location</a>, <a href="#bounds" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.bounds</a>, <a href="#size" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size</a>, <a href="#size_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size_=</a>, <a href="#size_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size_=</a>, <a href="#locale" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.locale</a>, <a href="#toolkit" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.toolkit</a>, <a href="#cursor" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.cursor</a>, <a href="#cursor_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.cursor_=</a>, <a href="#visible" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.visible</a>, <a href="#visible_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.visible_=</a>, <a href="#showing" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.showing</a>, <a href="#repaint" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.repaint</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Proxy">scala.Proxy</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#hashCode" target="contentFrame" class="scala/Proxy">scala.Proxy.hashCode</a>, <a href="#equals" target="contentFrame" class="scala/Proxy">scala.Proxy.equals</a>, <a href="#toString" target="contentFrame" class="scala/Proxy">scala.Proxy.toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="scala.swing.UIElement#background">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">background</span><span class="result">: <span class="extype" name="java.awt.Color">Color</span></span>
+      </span>
+      </h4>
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="mainPanel"></a><dl>
-      <dt>
+    </li><li name="scala.swing.UIElement#background_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">background_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Color">Color</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#bounds">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">bounds</span><span class="result">: <span class="extype" name="java.awt.Rectangle">Rectangle</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Window#centerOnScreen">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">centerOnScreen</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Window#close">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">close</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Window#closeOperation">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">closeOperation</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.RootPanel#contents">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">contents</span><span class="result">: <span class="extype" name="scala.collection.Seq">Seq</span>[<span class="extype" name="scala.swing.Component">Component</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Window#contents_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">contents_=</span><span class="params">(<span name="c">c: <span class="extype" name="scala.swing.Component">Component</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#cursor">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cursor</span><span class="result">: <span class="extype" name="java.awt.Cursor">Cursor</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#cursor_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cursor_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Cursor">Cursor</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#deafTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">deafTo</span><span class="params">(<span name="ps">ps: <span class="extype" name="scala.swing.Publisher">Publisher</span>*</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Window#defaultButton">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">defaultButton</span><span class="result">: <span class="extype" name="scala.Option">Option</span>[<span class="extype" name="scala.swing.Button">Button</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Window#defaultButton_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">defaultButton_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Option">Option</span>[<span class="extype" name="scala.swing.Button">Button</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Window#defaultButton_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">defaultButton_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.swing.Button">Button</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#displayable">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">displayable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Window#dispose">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">dispose</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="that">that: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.UIElement#font">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">font</span><span class="result">: <span class="extype" name="java.awt.Font">Font</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#font_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">font_=</span><span class="params">(<span name="f">f: <span class="extype" name="java.awt.Font">Font</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#foreground">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">foreground</span><span class="result">: <span class="extype" name="java.awt.Color">Color</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#foreground_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">foreground_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Color">Color</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.Frame#iconImage">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">iconImage</span><span class="result">: <span class="extype" name="java.awt.Image">Image</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Frame#iconImage_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">iconImage_=</span><span class="params">(<span name="i">i: <span class="extype" name="java.awt.Image">Image</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Frame#iconified">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">iconified</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Frame#iconify">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">iconify</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#ignoreRepaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">ignoreRepaint</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#ignoreRepaint_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">ignoreRepaint_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#listenTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">listenTo</span><span class="params">(<span name="ps">ps: <span class="extype" name="scala.swing.Publisher">Publisher</span>*</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#locale">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">locale</span><span class="result">: <span class="extype" name="java.util.Locale">Locale</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#location">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">location</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#locationOnScreen">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">locationOnScreen</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Window#location_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">location_=</span><span class="params">(<span name="p">p: <span class="extype" name="java.awt.Point">Point</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.MainFrame#mainPanel">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">mainPanel</span><span class="result">: <a href="MainPanel.html" class="extype" name="graphyx.gui.MainPanel">MainPanel</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Frame#maximize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximize</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Frame#maximized">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximized</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#maximumSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximumSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#maximumSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximumSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.RichWindow#menuBar">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">menuBar</span><span class="result">: <span class="extype" name="scala.swing.MenuBar">MenuBar</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.RichWindow#menuBar_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">menuBar_=</span><span class="params">(<span name="m">m: <span class="extype" name="scala.swing.MenuBar">MenuBar</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#minimumSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">minimumSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#minimumSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">minimumSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#onFirstSubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">onFirstSubscribe</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#onLastUnsubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">onLastUnsubscribe</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Window#open">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">open</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Window#owner">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">owner</span><span class="result">: <span class="extype" name="scala.swing.Window">Window</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Window#pack">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">pack</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.swing.Window">Window</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Frame#peer">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">peer</span><span class="result">: <span class="extype" name="javax.swing.JFrame">JFrame</span> with <span class="extype" name="scala.swing.RichWindow.InterfaceMixin">InterfaceMixin</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize_=</span><span class="params">(<span name="xy">xy: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Publisher#publish">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">publish</span><span class="params">(<span name="e">e: <span class="extype" name="scala.swing.event.Event">Event</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#reactions">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">reactions</span><span class="result">: <span class="extype" name="scala.swing.Reactions">Reactions</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#repaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">repaint</span><span class="params">(<span name="rect">rect: <span class="extype" name="java.awt.Rectangle">Rectangle</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#repaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">repaint</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.RichWindow#resizable">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">resizable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.RichWindow#resizable_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">resizable_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#self">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">self</span><span class="result">: <span class="extype" name="java.awt.Component">Component</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Window#setLocationRelativeTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">setLocationRelativeTo</span><span class="params">(<span name="c">c: <span class="extype" name="scala.swing.UIElement">UIElement</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#showing">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">showing</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size_=</span><span class="params">(<span name="xy">xy: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size_=</span><span class="params">(<span name="dim">dim: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LazyPublisher#subscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">subscribe</span><span class="params">(<span name="listener">listener: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.swing.event.Event">Event</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.RichWindow#title">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">title</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.RichWindow#title_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">title_=</span><span class="params">(<span name="s">s: <span class="extype" name="java.lang.String">String</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.UIElement#toolkit">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toolkit</span><span class="result">: <span class="extype" name="java.awt.Toolkit">Toolkit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Frame#uniconify">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">uniconify</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Frame#unmaximize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">unmaximize</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LazyPublisher#unsubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">unsubscribe</span><span class="params">(<span name="listener">listener: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.swing.event.Event">Event</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#visible">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">visible</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#visible_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">visible_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>val</code>
-        <em>mainPanel</em> : <a href="../../graphyx/gui/MainPanel.html" target="_self">MainPanel</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.gui.MainFrame#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">MainFrame</span><span class="params">(<span name="container">container: <a href="Container.html" class="extype" name="graphyx.gui.Container">Container</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Frame#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">MainFrame</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/gui/MainPanel.html b/doc/graphyx/gui/MainPanel.html
index 57eb648..f519d72 100644
--- a/doc/graphyx/gui/MainPanel.html
+++ b/doc/graphyx/gui/MainPanel.html
@@ -1,349 +1,774 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class MainPanel in graphyx.gui</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.gui.MainPanel</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/gui$package.html" target="_self">graphyx.gui</a>
-        <br></br>
-        <span class="entity">class  MainPanel</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/gui/MainPanel"><code>graphyx/gui/MainPanel.scala</code></a>]
-      </div><hr></hr>
-      <a name="MainPanel"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>class</code>
-        <em>MainPanel</em>(<em>container</em> : <a href="../../graphyx/gui/Container.html" target="_self">Container</a>)
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/swing/GridBagPanel">scala.swing.GridBagPanel</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">gui</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/MainPanel.html#c" target="_self">c</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/GridBagPanel/Constraints">scala.swing.GridBagPanel.Constraints</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/MainPanel.html#controlPanel" target="_self">controlPanel</a></em>
-         : <a href="../../graphyx/gui/ControlPanel.html" target="_self">ControlPanel</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/MainPanel.html#gravityPanel" target="_self">gravityPanel</a></em>
-         : <a href="../../graphyx/gui/GravityPanel.html" target="_self">GravityPanel</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/MainPanel.html#infoPanel" target="_self">infoPanel</a></em>
-         : <a href="../../graphyx/gui/InfoPanel.html" target="_self">InfoPanel</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/MainPanel.html#menuPanel" target="_self">menuPanel</a></em>
-         : <a href="../../graphyx/gui/MenuPanel.html" target="_self">MenuPanel</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/MainPanel.html#optionsPanel" target="_self">optionsPanel</a></em>
-         : <a href="../../graphyx/gui/OptionsPanel.html" target="_self">OptionsPanel</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/MainPanel.html#shapeInfoPanel" target="_self">shapeInfoPanel</a></em>
-         : <a href="../../graphyx/gui/ShapeInfoPanel.html" target="_self">ShapeInfoPanel</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/MainPanel.html#splitter" target="_self">splitter</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/SplitPane">scala.swing.SplitPane</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/MainPanel.html#worldPanel" target="_self">worldPanel</a></em>
-         : <a href="../../graphyx/gui/WorldPanel.html" target="_self">WorldPanel</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/GridBagPanel">scala.swing.GridBagPanel</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#peer" target="contentFrame" class="scala/swing/GridBagPanel">scala.swing.GridBagPanel.peer</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Container/Wrapper">scala.swing.Container.Wrapper</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#_contents" target="contentFrame" class="scala/swing/Container/Wrapper">scala.swing.Container.Wrapper._contents</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#initP" target="contentFrame" class="scala/swing/Component">scala.swing.Component.initP</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#listeners" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.listeners</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#reactions" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.reactions</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/GridBagPanel">scala.swing.GridBagPanel</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#pair2Constraints" target="contentFrame" class="scala/swing/GridBagPanel">scala.swing.GridBagPanel.pair2Constraints</a>, <a href="#constraintsFor" target="contentFrame" class="scala/swing/GridBagPanel">scala.swing.GridBagPanel.constraintsFor</a>, <a href="#areValid" target="contentFrame" class="scala/swing/GridBagPanel">scala.swing.GridBagPanel.areValid</a>, <a href="#add" target="contentFrame" class="scala/swing/GridBagPanel">scala.swing.GridBagPanel.add</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/LayoutContainer">scala.swing.LayoutContainer</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#layout" target="contentFrame" class="scala/swing/LayoutContainer">scala.swing.LayoutContainer.layout</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Container/Wrapper">scala.swing.Container.Wrapper</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#contents" target="contentFrame" class="scala/swing/Container/Wrapper">scala.swing.Container.Wrapper.contents</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#xLayoutAlignment" target="contentFrame" class="scala/swing/Component">scala.swing.Component.xLayoutAlignment</a>, <a href="#xLayoutAlignment_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.xLayoutAlignment_=</a>, <a href="#yLayoutAlignment" target="contentFrame" class="scala/swing/Component">scala.swing.Component.yLayoutAlignment</a>, <a href="#yLayoutAlignment_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.yLayoutAlignment_=</a>, <a href="#border" target="contentFrame" class="scala/swing/Component">scala.swing.Component.border</a>, <a href="#border_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.border_=</a>, <a href="#opaque" target="contentFrame" class="scala/swing/Component">scala.swing.Component.opaque</a>, <a href="#opaque_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.opaque_=</a>, <a href="#enabled" target="contentFrame" class="scala/swing/Component">scala.swing.Component.enabled</a>, <a href="#enabled_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.enabled_=</a>, <a href="#tooltip" target="contentFrame" class="scala/swing/Component">scala.swing.Component.tooltip</a>, <a href="#tooltip_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.tooltip_=</a>, <a href="#inputVerifier" target="contentFrame" class="scala/swing/Component">scala.swing.Component.inputVerifier</a>, <a href="#inputVerifier_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.inputVerifier_=</a>, <a href="#revalidate" target="contentFrame" class="scala/swing/Component">scala.swing.Component.revalidate</a>, <a href="#requestFocus" target="contentFrame" class="scala/swing/Component">scala.swing.Component.requestFocus</a>, <a href="#paintComponent" target="contentFrame" class="scala/swing/Component">scala.swing.Component.paintComponent</a>, <a href="#paint" target="contentFrame" class="scala/swing/Component">scala.swing.Component.paint</a>, <a href="#toString" target="contentFrame" class="scala/swing/Component">scala.swing.Component.toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#subscribe" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.subscribe</a>, <a href="#unsubscribe" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.unsubscribe</a>, <a href="#publish" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.publish</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#listenTo" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.listenTo</a>, <a href="#deafTo" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.deafTo</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#self" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.self</a>, <a href="#foreground" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.foreground</a>, <a href="#foreground_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.foreground_=</a>, <a href="#background" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.background</a>, <a href="#background_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.background_=</a>, <a href="#minimumSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.minimumSize</a>, <a href="#minimumSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.minimumSize_=</a>, <a href="#maximumSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.maximumSize</a>, <a href="#maximumSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.maximumSize_=</a>, <a href="#preferredSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize</a>, <a href="#preferredSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize_=</a>, <a href="#preferredSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize_=</a>, <a href="#font" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.font</a>, <a href="#font_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.font_=</a>, <a href="#locationOnScreen" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.locationOnScreen</a>, <a href="#location" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.location</a>, <a href="#bounds" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.bounds</a>, <a href="#size" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size</a>, <a href="#size_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size_=</a>, <a href="#size_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size_=</a>, <a href="#locale" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.locale</a>, <a href="#toolkit" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.toolkit</a>, <a href="#cursor" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.cursor</a>, <a href="#cursor_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.cursor_=</a>, <a href="#visible" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.visible</a>, <a href="#visible_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.visible_=</a>, <a href="#showing" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.showing</a>, <a href="#repaint" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.repaint</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Proxy">scala.Proxy</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#hashCode" target="contentFrame" class="scala/Proxy">scala.Proxy.hashCode</a>, <a href="#equals" target="contentFrame" class="scala/Proxy">scala.Proxy.equals</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>MainPanel</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">MainPanel</span><span class="result"> extends <span class="extype" name="scala.swing.GridBagPanel">GridBagPanel</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="c"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>c</em> : <a href="" target="contentFrame" class="scala/swing/GridBagPanel/Constraints">scala.swing.GridBagPanel.Constraints</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="menuPanel"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>menuPanel</em> : <a href="../../graphyx/gui/MenuPanel.html" target="_self">MenuPanel</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="worldPanel"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>worldPanel</em> : <a href="../../graphyx/gui/WorldPanel.html" target="_self">WorldPanel</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="controlPanel"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>controlPanel</em> : <a href="../../graphyx/gui/ControlPanel.html" target="_self">ControlPanel</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="infoPanel"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.swing.GridBagPanel">GridBagPanel</li><li class="in" name="scala.swing.LayoutContainer">LayoutContainer</li><li class="in" name="scala.swing.Panel">Panel</li><li class="in" name="scala.swing.Container.Wrapper">Wrapper</li><li class="in" name="scala.swing.Container">Container</li><li class="in" name="scala.swing.Component">Component</li><li class="in" name="scala.swing.UIElement">UIElement</li><li class="in" name="scala.swing.LazyPublisher">LazyPublisher</li><li class="in" name="scala.swing.Publisher">Publisher</li><li class="in" name="scala.swing.Reactor">Reactor</li><li class="in" name="scala.Proxy">Proxy</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code></code>
-        <code>val</code>
-        <em>infoPanel</em> : <a href="../../graphyx/gui/InfoPanel.html" target="_self">InfoPanel</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="optionsPanel"></a><dl>
-      <dt>
         
-        <code></code>
-        <code>val</code>
-        <em>optionsPanel</em> : <a href="../../graphyx/gui/OptionsPanel.html" target="_self">OptionsPanel</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="shapeInfoPanel"></a><dl>
-      <dt>
         
-        <code></code>
-        <code>val</code>
-        <em>shapeInfoPanel</em> : <a href="../../graphyx/gui/ShapeInfoPanel.html" target="_self">ShapeInfoPanel</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="gravityPanel"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="scala.swing.Component#Mouse">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">Mouse</span><span class="result">: <span class="extype" name="scala.swing.Component.mouse">mouse</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#background">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">background</span><span class="result">: <span class="extype" name="java.awt.Color">Color</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#background_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">background_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Color">Color</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#border">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">border</span><span class="result">: <span class="extype" name="javax.swing.border.Border">Border</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#border_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">border_=</span><span class="params">(<span name="b">b: <span class="extype" name="javax.swing.border.Border">Border</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#bounds">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">bounds</span><span class="result">: <span class="extype" name="java.awt.Rectangle">Rectangle</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.MainPanel#c">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">c</span><span class="result">: <span class="extype" name="scala.swing.GridBagPanel.Constraints">Constraints</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Container.Wrapper#contents">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">contents</span><span class="result">: <span class="extype" name="scala.collection.Seq">Seq</span>[<span class="extype" name="scala.swing.Component">Component</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.MainPanel#controlPanel">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">controlPanel</span><span class="result">: <a href="ControlPanel.html" class="extype" name="graphyx.gui.ControlPanel">ControlPanel</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#cursor">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cursor</span><span class="result">: <span class="extype" name="java.awt.Cursor">Cursor</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#cursor_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cursor_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Cursor">Cursor</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#deafTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">deafTo</span><span class="params">(<span name="ps">ps: <span class="extype" name="scala.swing.Publisher">Publisher</span>*</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#displayable">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">displayable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#enabled">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">enabled</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#enabled_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">enabled_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="that">that: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.Component#focusable">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">focusable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#focusable_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">focusable_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#font">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">font</span><span class="result">: <span class="extype" name="java.awt.Font">Font</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#font_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">font_=</span><span class="params">(<span name="f">f: <span class="extype" name="java.awt.Font">Font</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#foreground">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">foreground</span><span class="result">: <span class="extype" name="java.awt.Color">Color</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#foreground_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">foreground_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Color">Color</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.MainPanel#gravityPanel">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">gravityPanel</span><span class="result">: <a href="GravityPanel.html" class="extype" name="graphyx.gui.GravityPanel">GravityPanel</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#hasFocus">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hasFocus</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.UIElement#ignoreRepaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">ignoreRepaint</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#ignoreRepaint_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">ignoreRepaint_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.MainPanel#infoPanel">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">infoPanel</span><span class="result">: <a href="InfoPanel.html" class="extype" name="graphyx.gui.InfoPanel">InfoPanel</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#initP">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">initP</span><span class="result">: <span class="extype" name="javax.swing.JComponent">JComponent</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#inputVerifier">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">inputVerifier</span><span class="result">: (MainPanel.this.type) ⇒ <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#inputVerifier_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">inputVerifier_=</span><span class="params">(<span name="v">v: (MainPanel.this.type) ⇒ <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LayoutContainer#layout">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">layout</span><span class="result">: <span class="extype" name="scala.collection.mutable.Map">Map</span>[<span class="extype" name="scala.swing.Component">Component</span>, <span class="extype" name="scala.swing.GridBagPanel.Constraints">Constraints</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#listenTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">listenTo</span><span class="params">(<span name="ps">ps: <span class="extype" name="scala.swing.Publisher">Publisher</span>*</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#locale">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">locale</span><span class="result">: <span class="extype" name="java.util.Locale">Locale</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#location">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">location</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#locationOnScreen">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">locationOnScreen</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#maximumSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximumSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#maximumSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximumSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.MainPanel#menuPanel">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">menuPanel</span><span class="result">: <a href="MenuPanel.html" class="extype" name="graphyx.gui.MenuPanel">MenuPanel</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#minimumSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">minimumSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#minimumSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">minimumSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#onFirstSubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">onFirstSubscribe</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#onLastUnsubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">onLastUnsubscribe</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#opaque">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">opaque</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#opaque_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">opaque_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.MainPanel#optionsPanel">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">optionsPanel</span><span class="result">: <a href="OptionsPanel.html" class="extype" name="graphyx.gui.OptionsPanel">OptionsPanel</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#paint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">paint</span><span class="params">(<span name="g">g: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.GridBagPanel#pair2Constraints">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">pair2Constraints</span><span class="params">(<span name="p">p: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.swing.GridBagPanel.Constraints">Constraints</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.GridBagPanel#peer">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">peer</span><span class="result">: <span class="extype" name="javax.swing.JPanel">JPanel</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize_=</span><span class="params">(<span name="xy">xy: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Publisher#publish">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">publish</span><span class="params">(<span name="e">e: <span class="extype" name="scala.swing.event.Event">Event</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#reactions">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">reactions</span><span class="result">: <span class="extype" name="scala.swing.Reactions">Reactions</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#repaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">repaint</span><span class="params">(<span name="rect">rect: <span class="extype" name="java.awt.Rectangle">Rectangle</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#repaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">repaint</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#requestFocus">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">requestFocus</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#requestFocusInWindow">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">requestFocusInWindow</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#revalidate">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">revalidate</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#self">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">self</span><span class="result">: <span class="extype" name="java.awt.Component">Component</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.MainPanel#shapeInfoPanel">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">shapeInfoPanel</span><span class="result">: <a href="ShapeInfoPanel.html" class="extype" name="graphyx.gui.ShapeInfoPanel">ShapeInfoPanel</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#showing">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">showing</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size_=</span><span class="params">(<span name="xy">xy: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size_=</span><span class="params">(<span name="dim">dim: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.MainPanel#splitter">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">splitter</span><span class="result">: <span class="extype" name="scala.swing.SplitPane">SplitPane</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LazyPublisher#subscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">subscribe</span><span class="params">(<span name="listener">listener: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.swing.event.Event">Event</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Component ⇐ Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.UIElement#toolkit">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toolkit</span><span class="result">: <span class="extype" name="java.awt.Toolkit">Toolkit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#tooltip">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">tooltip</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#tooltip_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">tooltip_=</span><span class="params">(<span name="t">t: <span class="extype" name="java.lang.String">String</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LazyPublisher#unsubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">unsubscribe</span><span class="params">(<span name="listener">listener: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.swing.event.Event">Event</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#visible">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">visible</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#visible_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">visible_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.MainPanel#worldPanel">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">worldPanel</span><span class="result">: <a href="WorldPanel.html" class="extype" name="graphyx.gui.WorldPanel">WorldPanel</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#xLayoutAlignment">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">xLayoutAlignment</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#xLayoutAlignment_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">xLayoutAlignment_=</span><span class="params">(<span name="x">x: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#yLayoutAlignment">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">yLayoutAlignment</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#yLayoutAlignment_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">yLayoutAlignment_=</span><span class="params">(<span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>val</code>
-        <em>gravityPanel</em> : <a href="../../graphyx/gui/GravityPanel.html" target="_self">GravityPanel</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="splitter"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.gui.MainPanel#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">MainPanel</span><span class="params">(<span name="container">container: <a href="Container.html" class="extype" name="graphyx.gui.Container">Container</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.GridBagPanel#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">MainPanel</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>val</code>
-        <em>splitter</em> : <a href="" target="contentFrame" class="scala/swing/SplitPane">scala.swing.SplitPane</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/gui/MenuHelp.html b/doc/graphyx/gui/MenuHelp.html
index 311784d..0b16973 100644
--- a/doc/graphyx/gui/MenuHelp.html
+++ b/doc/graphyx/gui/MenuHelp.html
@@ -1,202 +1,1094 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class MenuHelp in graphyx.gui</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.gui.MenuHelp</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/gui$package.html" target="_self">graphyx.gui</a>
-        <br></br>
-        <span class="entity">class  MenuHelp</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/gui/MenuHelp"><code>graphyx/gui/MenuHelp.scala</code></a>]
-      </div><hr></hr>
-      <a name="MenuHelp"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>class</code>
-        <em>MenuHelp</em>
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/swing/Menu">scala.swing.Menu</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">gui</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/MenuHelp.html#components" target="_self">components</a></em>
-         : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="" target="contentFrame" class="scala/swing/MenuItem">scala.swing.MenuItem</a>]
-        
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>MenuHelp</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">MenuHelp</span><span class="result"> extends <span class="extype" name="scala.swing.Menu">Menu</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.swing.Menu">Menu</li><li class="in" name="scala.swing.SequentialContainer.Wrapper">Wrapper</li><li class="in" name="scala.swing.Container.Wrapper">Wrapper</li><li class="in" name="scala.swing.SequentialContainer">SequentialContainer</li><li class="in" name="scala.swing.Container">Container</li><li class="in" name="scala.swing.MenuItem">MenuItem</li><li class="in" name="scala.swing.AbstractButton">AbstractButton</li><li class="in" name="scala.swing.Action.Trigger">Trigger</li><li class="in" name="scala.swing.Component">Component</li><li class="in" name="scala.swing.UIElement">UIElement</li><li class="in" name="scala.swing.LazyPublisher">LazyPublisher</li><li class="in" name="scala.swing.Publisher">Publisher</li><li class="in" name="scala.swing.Reactor">Reactor</li><li class="in" name="scala.Proxy">Proxy</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/MenuHelp.html#miAbout" target="_self">miAbout</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/MenuItem">scala.swing.MenuItem</a>
         
         
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Menu">scala.swing.Menu</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#peer" target="contentFrame" class="scala/swing/Menu">scala.swing.Menu.peer</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/SequentialContainer/Wrapper">scala.swing.SequentialContainer.Wrapper</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#contents" target="contentFrame" class="scala/swing/SequentialContainer/Wrapper">scala.swing.SequentialContainer.Wrapper.contents</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Container/Wrapper">scala.swing.Container.Wrapper</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#_contents" target="contentFrame" class="scala/swing/Container/Wrapper">scala.swing.Container.Wrapper._contents</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#initP" target="contentFrame" class="scala/swing/Component">scala.swing.Component.initP</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#listeners" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.listeners</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#reactions" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.reactions</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#text" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.text</a>, <a href="#text_=" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.text_=</a>, <a href="#icon" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.icon</a>, <a href="#icon_=" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.icon_=</a>, <a href="#pressedIcon" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.pressedIcon</a>, <a href="#pressedIcon_=" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.pressedIcon_=</a>, <a href="#selectedIcon" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.selectedIcon</a>, <a href="#selectedIcon_=" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.selectedIcon_=</a>, <a href="#disabledIcon" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.disabledIcon</a>, <a href="#disabledIcon_=" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.disabledIcon_=</a>, <a href="#disabledSelectedIcon" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.disabledSelectedIcon</a>, <a href="#disabledSelectedIcon_=" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.disabledSelectedIcon_=</a>, <a href="#rolloverIcon" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.rolloverIcon</a>, <a href="#rolloverIcon_=" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.rolloverIcon_=</a>, <a href="#rolloverSelectedIcon" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.rolloverSelectedIcon</a>, <a href="#rolloverSelectedIcon_=" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.rolloverSelectedIcon_=</a>, <a href="#action" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.action</a>, <a href="#action_=" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.action_=</a>, <a href="#selected" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.selected</a>, <a href="#selected_=" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.selected_=</a>, <a href="#contentAreaFilled" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.contentAreaFilled</a>, <a href="#contentAreaFilled_=" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.contentAreaFilled_=</a>, <a href="#borderPainted" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.borderPainted</a>, <a href="#borderPainted_=" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.borderPainted_=</a>, <a href="#focusPainted" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.focusPainted</a>, <a href="#focusPainted_=" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.focusPainted_=</a>, <a href="#rolloverEnabled" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.rolloverEnabled</a>, <a href="#rolloverEnabled_=" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.rolloverEnabled_=</a>, <a href="#verticalTextPosition" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.verticalTextPosition</a>, <a href="#verticalTextPosition_=" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.verticalTextPosition_=</a>, <a href="#verticalAlignment" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.verticalAlignment</a>, <a href="#verticalAlignment_=" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.verticalAlignment_=</a>, <a href="#horizontalTextPosition" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.horizontalTextPosition</a>, <a href="#horizontalTextPosition_=" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.horizontalTextPosition_=</a>, <a href="#horizontalAlignment" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.horizontalAlignment</a>, <a href="#horizontalAlignment_=" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.horizontalAlignment_=</a>, <a href="#iconTextGap" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.iconTextGap</a>, <a href="#iconTextGap_=" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.iconTextGap_=</a>, <a href="#mnemonic" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.mnemonic</a>, <a href="#mnemonic_=" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.mnemonic_=</a>, <a href="#displayedMnemonicIndex" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.displayedMnemonicIndex</a>, <a href="#displayedMnemonicIndex_=" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.displayedMnemonicIndex_=</a>, <a href="#multiClickThreshold" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.multiClickThreshold</a>, <a href="#multiClickThreshold_=" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.multiClickThreshold_=</a>, <a href="#doClick" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.doClick</a>, <a href="#doClick" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.doClick</a>, <a href="#margin" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.margin</a>, <a href="#margin_=" target="contentFrame" class="scala/swing/AbstractButton">scala.swing.AbstractButton.margin_=</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#xLayoutAlignment" target="contentFrame" class="scala/swing/Component">scala.swing.Component.xLayoutAlignment</a>, <a href="#xLayoutAlignment_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.xLayoutAlignment_=</a>, <a href="#yLayoutAlignment" target="contentFrame" class="scala/swing/Component">scala.swing.Component.yLayoutAlignment</a>, <a href="#yLayoutAlignment_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.yLayoutAlignment_=</a>, <a href="#border" target="contentFrame" class="scala/swing/Component">scala.swing.Component.border</a>, <a href="#border_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.border_=</a>, <a href="#opaque" target="contentFrame" class="scala/swing/Component">scala.swing.Component.opaque</a>, <a href="#opaque_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.opaque_=</a>, <a href="#enabled" target="contentFrame" class="scala/swing/Component">scala.swing.Component.enabled</a>, <a href="#enabled_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.enabled_=</a>, <a href="#tooltip" target="contentFrame" class="scala/swing/Component">scala.swing.Component.tooltip</a>, <a href="#tooltip_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.tooltip_=</a>, <a href="#inputVerifier" target="contentFrame" class="scala/swing/Component">scala.swing.Component.inputVerifier</a>, <a href="#inputVerifier_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.inputVerifier_=</a>, <a href="#revalidate" target="contentFrame" class="scala/swing/Component">scala.swing.Component.revalidate</a>, <a href="#requestFocus" target="contentFrame" class="scala/swing/Component">scala.swing.Component.requestFocus</a>, <a href="#paintComponent" target="contentFrame" class="scala/swing/Component">scala.swing.Component.paintComponent</a>, <a href="#paint" target="contentFrame" class="scala/swing/Component">scala.swing.Component.paint</a>, <a href="#toString" target="contentFrame" class="scala/swing/Component">scala.swing.Component.toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#subscribe" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.subscribe</a>, <a href="#unsubscribe" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.unsubscribe</a>, <a href="#publish" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.publish</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#listenTo" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.listenTo</a>, <a href="#deafTo" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.deafTo</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#self" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.self</a>, <a href="#foreground" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.foreground</a>, <a href="#foreground_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.foreground_=</a>, <a href="#background" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.background</a>, <a href="#background_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.background_=</a>, <a href="#minimumSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.minimumSize</a>, <a href="#minimumSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.minimumSize_=</a>, <a href="#maximumSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.maximumSize</a>, <a href="#maximumSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.maximumSize_=</a>, <a href="#preferredSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize</a>, <a href="#preferredSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize_=</a>, <a href="#preferredSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize_=</a>, <a href="#font" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.font</a>, <a href="#font_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.font_=</a>, <a href="#locationOnScreen" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.locationOnScreen</a>, <a href="#location" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.location</a>, <a href="#bounds" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.bounds</a>, <a href="#size" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size</a>, <a href="#size_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size_=</a>, <a href="#size_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size_=</a>, <a href="#locale" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.locale</a>, <a href="#toolkit" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.toolkit</a>, <a href="#cursor" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.cursor</a>, <a href="#cursor_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.cursor_=</a>, <a href="#visible" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.visible</a>, <a href="#visible_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.visible_=</a>, <a href="#showing" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.showing</a>, <a href="#repaint" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.repaint</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Proxy">scala.Proxy</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#hashCode" target="contentFrame" class="scala/Proxy">scala.Proxy.hashCode</a>, <a href="#equals" target="contentFrame" class="scala/Proxy">scala.Proxy.equals</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="scala.swing.Component#Mouse">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">Mouse</span><span class="result">: <span class="extype" name="scala.swing.Component.mouse">mouse</span></span>
+      </span>
+      </h4>
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="miAbout"></a><dl>
-      <dt>
+    </li><li name="scala.swing.AbstractButton#action">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">action</span><span class="result">: <span class="extype" name="scala.swing.Action">Action</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#action_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">action_=</span><span class="params">(<span name="a">a: <span class="extype" name="scala.swing.Action">Action</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#background">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">background</span><span class="result">: <span class="extype" name="java.awt.Color">Color</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#background_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">background_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Color">Color</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#border">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">border</span><span class="result">: <span class="extype" name="javax.swing.border.Border">Border</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#borderPainted">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">borderPainted</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#borderPainted_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">borderPainted_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#border_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">border_=</span><span class="params">(<span name="b">b: <span class="extype" name="javax.swing.border.Border">Border</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#bounds">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">bounds</span><span class="result">: <span class="extype" name="java.awt.Rectangle">Rectangle</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.MenuHelp#components">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">components</span><span class="result">: <span class="extype" name="scala.collection.immutable.List">List</span>[<span class="extype" name="scala.swing.MenuItem">MenuItem</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#contentAreaFilled">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">contentAreaFilled</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#contentAreaFilled_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">contentAreaFilled_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.SequentialContainer.Wrapper#contents">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">contents</span><span class="result">: <span class="extype" name="scala.collection.mutable.Buffer">Buffer</span>[<span class="extype" name="scala.swing.Component">Component</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#cursor">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cursor</span><span class="result">: <span class="extype" name="java.awt.Cursor">Cursor</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#cursor_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cursor_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Cursor">Cursor</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#deafTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">deafTo</span><span class="params">(<span name="ps">ps: <span class="extype" name="scala.swing.Publisher">Publisher</span>*</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#disabledIcon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">disabledIcon</span><span class="result">: <span class="extype" name="javax.swing.Icon">Icon</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#disabledIcon_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">disabledIcon_=</span><span class="params">(<span name="i">i: <span class="extype" name="javax.swing.Icon">Icon</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#disabledSelectedIcon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">disabledSelectedIcon</span><span class="result">: <span class="extype" name="javax.swing.Icon">Icon</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#disabledSelectedIcon_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">disabledSelectedIcon_=</span><span class="params">(<span name="i">i: <span class="extype" name="javax.swing.Icon">Icon</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#displayable">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">displayable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#displayedMnemonicIndex">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">displayedMnemonicIndex</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#displayedMnemonicIndex_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">displayedMnemonicIndex_=</span><span class="params">(<span name="n">n: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#doClick">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">doClick</span><span class="params">(<span name="times">times: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#doClick">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">doClick</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#enabled">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">enabled</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#enabled_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">enabled_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="that">that: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.AbstractButton#focusPainted">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">focusPainted</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#focusPainted_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">focusPainted_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#focusable">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">focusable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#focusable_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">focusable_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#font">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">font</span><span class="result">: <span class="extype" name="java.awt.Font">Font</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#font_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">font_=</span><span class="params">(<span name="f">f: <span class="extype" name="java.awt.Font">Font</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#foreground">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">foreground</span><span class="result">: <span class="extype" name="java.awt.Color">Color</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#foreground_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">foreground_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Color">Color</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#hasFocus">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hasFocus</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.AbstractButton#horizontalAlignment">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">horizontalAlignment</span><span class="result">: <span class="extype" name="scala.Enumeration.Value">Value</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#horizontalAlignment_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">horizontalAlignment_=</span><span class="params">(<span name="a">a: <span class="extype" name="scala.Enumeration.Value">Value</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#horizontalTextPosition">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">horizontalTextPosition</span><span class="result">: <span class="extype" name="scala.Enumeration.Value">Value</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#horizontalTextPosition_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">horizontalTextPosition_=</span><span class="params">(<span name="a">a: <span class="extype" name="scala.Enumeration.Value">Value</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#icon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">icon</span><span class="result">: <span class="extype" name="javax.swing.Icon">Icon</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#iconTextGap">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">iconTextGap</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#iconTextGap_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">iconTextGap_=</span><span class="params">(<span name="x">x: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#icon_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">icon_=</span><span class="params">(<span name="i">i: <span class="extype" name="javax.swing.Icon">Icon</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#ignoreRepaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">ignoreRepaint</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#ignoreRepaint_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">ignoreRepaint_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#initP">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">initP</span><span class="result">: <span class="extype" name="javax.swing.JComponent">JComponent</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#inputVerifier">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">inputVerifier</span><span class="result">: (MenuHelp.this.type) ⇒ <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#inputVerifier_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">inputVerifier_=</span><span class="params">(<span name="v">v: (MenuHelp.this.type) ⇒ <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#listenTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">listenTo</span><span class="params">(<span name="ps">ps: <span class="extype" name="scala.swing.Publisher">Publisher</span>*</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#locale">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">locale</span><span class="result">: <span class="extype" name="java.util.Locale">Locale</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#location">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">location</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#locationOnScreen">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">locationOnScreen</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#margin">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">margin</span><span class="result">: <span class="extype" name="java.awt.Insets">Insets</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#margin_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">margin_=</span><span class="params">(<span name="i">i: <span class="extype" name="java.awt.Insets">Insets</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#maximumSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximumSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#maximumSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximumSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.MenuHelp#miAbout">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">miAbout</span><span class="result">: <span class="extype" name="scala.swing.MenuItem">MenuItem</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#minimumSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">minimumSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#minimumSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">minimumSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#mnemonic">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">mnemonic</span><span class="result">: <span class="extype" name="scala.Enumeration.Value">Value</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#mnemonic_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">mnemonic_=</span><span class="params">(<span name="k">k: <span class="extype" name="scala.Enumeration.Value">Value</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#multiClickThreshold">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">multiClickThreshold</span><span class="result">: <span class="extype" name="scala.Long">Long</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#multiClickThreshold_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">multiClickThreshold_=</span><span class="params">(<span name="n">n: <span class="extype" name="scala.Long">Long</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#onFirstSubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">onFirstSubscribe</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#onLastUnsubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">onLastUnsubscribe</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#opaque">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">opaque</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#opaque_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">opaque_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#paint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">paint</span><span class="params">(<span name="g">g: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Menu#peer">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">peer</span><span class="result">: <span class="extype" name="javax.swing.JMenu">JMenu</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize_=</span><span class="params">(<span name="xy">xy: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#pressedIcon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">pressedIcon</span><span class="result">: <span class="extype" name="javax.swing.Icon">Icon</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#pressedIcon_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">pressedIcon_=</span><span class="params">(<span name="i">i: <span class="extype" name="javax.swing.Icon">Icon</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Publisher#publish">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">publish</span><span class="params">(<span name="e">e: <span class="extype" name="scala.swing.event.Event">Event</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#reactions">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">reactions</span><span class="result">: <span class="extype" name="scala.swing.Reactions">Reactions</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#repaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">repaint</span><span class="params">(<span name="rect">rect: <span class="extype" name="java.awt.Rectangle">Rectangle</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#repaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">repaint</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#requestFocus">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">requestFocus</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#requestFocusInWindow">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">requestFocusInWindow</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#revalidate">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">revalidate</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#rolloverEnabled">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">rolloverEnabled</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#rolloverEnabled_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">rolloverEnabled_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#rolloverIcon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">rolloverIcon</span><span class="result">: <span class="extype" name="javax.swing.Icon">Icon</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#rolloverIcon_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">rolloverIcon_=</span><span class="params">(<span name="b">b: <span class="extype" name="javax.swing.Icon">Icon</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#rolloverSelectedIcon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">rolloverSelectedIcon</span><span class="result">: <span class="extype" name="javax.swing.Icon">Icon</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#rolloverSelectedIcon_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">rolloverSelectedIcon_=</span><span class="params">(<span name="b">b: <span class="extype" name="javax.swing.Icon">Icon</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#selected">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">selected</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#selectedIcon">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">selectedIcon</span><span class="result">: <span class="extype" name="javax.swing.Icon">Icon</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#selectedIcon_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">selectedIcon_=</span><span class="params">(<span name="i">i: <span class="extype" name="javax.swing.Icon">Icon</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#selected_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">selected_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#self">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">self</span><span class="result">: <span class="extype" name="java.awt.Component">Component</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#showing">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">showing</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size_=</span><span class="params">(<span name="xy">xy: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size_=</span><span class="params">(<span name="dim">dim: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LazyPublisher#subscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">subscribe</span><span class="params">(<span name="listener">listener: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.swing.event.Event">Event</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#text">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">text</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#text_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">text_=</span><span class="params">(<span name="s">s: <span class="extype" name="java.lang.String">String</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Component ⇐ Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.UIElement#toolkit">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toolkit</span><span class="result">: <span class="extype" name="java.awt.Toolkit">Toolkit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#tooltip">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">tooltip</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#tooltip_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">tooltip_=</span><span class="params">(<span name="t">t: <span class="extype" name="java.lang.String">String</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LazyPublisher#unsubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">unsubscribe</span><span class="params">(<span name="listener">listener: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.swing.event.Event">Event</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#verticalAlignment">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">verticalAlignment</span><span class="result">: <span class="extype" name="scala.Enumeration.Value">Value</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#verticalAlignment_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">verticalAlignment_=</span><span class="params">(<span name="a">a: <span class="extype" name="scala.Enumeration.Value">Value</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#verticalTextPosition">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">verticalTextPosition</span><span class="result">: <span class="extype" name="scala.Enumeration.Value">Value</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.AbstractButton#verticalTextPosition_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">verticalTextPosition_=</span><span class="params">(<span name="a">a: <span class="extype" name="scala.Enumeration.Value">Value</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#visible">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">visible</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#visible_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">visible_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#xLayoutAlignment">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">xLayoutAlignment</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#xLayoutAlignment_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">xLayoutAlignment_=</span><span class="params">(<span name="x">x: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#yLayoutAlignment">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">yLayoutAlignment</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#yLayoutAlignment_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">yLayoutAlignment_=</span><span class="params">(<span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>val</code>
-        <em>miAbout</em> : <a href="" target="contentFrame" class="scala/swing/MenuItem">scala.swing.MenuItem</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="components"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.gui.MenuHelp#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">MenuHelp</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Menu#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">MenuHelp</span><span class="params">(<span name="title0">title0: <span class="extype" name="java.lang.String">String</span></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.MenuItem#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">MenuHelp</span><span class="params">(<span name="a">a: <span class="extype" name="scala.swing.Action">Action</span></span>)</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>val</code>
-        <em>components</em> : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="" target="contentFrame" class="scala/swing/MenuItem">scala.swing.MenuItem</a>]
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/gui/MenuPanel.html b/doc/graphyx/gui/MenuPanel.html
index a685510..0b83492 100644
--- a/doc/graphyx/gui/MenuPanel.html
+++ b/doc/graphyx/gui/MenuPanel.html
@@ -1,175 +1,702 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class MenuPanel in graphyx.gui</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.gui.MenuPanel</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/gui$package.html" target="_self">graphyx.gui</a>
-        <br></br>
-        <span class="entity">class  MenuPanel</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/gui/MenuPanel"><code>graphyx/gui/MenuPanel.scala</code></a>]
-      </div><hr></hr>
-      <a name="MenuPanel"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>class</code>
-        <em>MenuPanel</em>(<em>container</em> : <a href="../../graphyx/gui/Container.html" target="_self">Container</a>)
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/swing/BoxPanel">scala.swing.BoxPanel</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">gui</a></p>
+
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>MenuPanel</h1>
+      </div>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/MenuPanel.html#mnu" target="_self">mnu</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/MenuBar">scala.swing.MenuBar</a>
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">MenuPanel</span><span class="result"> extends <span class="extype" name="scala.swing.BoxPanel">BoxPanel</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.swing.BoxPanel">BoxPanel</li><li class="in" name="scala.swing.SequentialContainer.Wrapper">Wrapper</li><li class="in" name="scala.swing.SequentialContainer">SequentialContainer</li><li class="in" name="scala.swing.Panel">Panel</li><li class="in" name="scala.swing.Container.Wrapper">Wrapper</li><li class="in" name="scala.swing.Container">Container</li><li class="in" name="scala.swing.Component">Component</li><li class="in" name="scala.swing.UIElement">UIElement</li><li class="in" name="scala.swing.LazyPublisher">LazyPublisher</li><li class="in" name="scala.swing.Publisher">Publisher</li><li class="in" name="scala.swing.Reactor">Reactor</li><li class="in" name="scala.Proxy">Proxy</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
         
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/BoxPanel">scala.swing.BoxPanel</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#peer" target="contentFrame" class="scala/swing/BoxPanel">scala.swing.BoxPanel.peer</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/SequentialContainer/Wrapper">scala.swing.SequentialContainer.Wrapper</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#contents" target="contentFrame" class="scala/swing/SequentialContainer/Wrapper">scala.swing.SequentialContainer.Wrapper.contents</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Container/Wrapper">scala.swing.Container.Wrapper</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#_contents" target="contentFrame" class="scala/swing/Container/Wrapper">scala.swing.Container.Wrapper._contents</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#initP" target="contentFrame" class="scala/swing/Component">scala.swing.Component.initP</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#listeners" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.listeners</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#reactions" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.reactions</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#xLayoutAlignment" target="contentFrame" class="scala/swing/Component">scala.swing.Component.xLayoutAlignment</a>, <a href="#xLayoutAlignment_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.xLayoutAlignment_=</a>, <a href="#yLayoutAlignment" target="contentFrame" class="scala/swing/Component">scala.swing.Component.yLayoutAlignment</a>, <a href="#yLayoutAlignment_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.yLayoutAlignment_=</a>, <a href="#border" target="contentFrame" class="scala/swing/Component">scala.swing.Component.border</a>, <a href="#border_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.border_=</a>, <a href="#opaque" target="contentFrame" class="scala/swing/Component">scala.swing.Component.opaque</a>, <a href="#opaque_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.opaque_=</a>, <a href="#enabled" target="contentFrame" class="scala/swing/Component">scala.swing.Component.enabled</a>, <a href="#enabled_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.enabled_=</a>, <a href="#tooltip" target="contentFrame" class="scala/swing/Component">scala.swing.Component.tooltip</a>, <a href="#tooltip_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.tooltip_=</a>, <a href="#inputVerifier" target="contentFrame" class="scala/swing/Component">scala.swing.Component.inputVerifier</a>, <a href="#inputVerifier_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.inputVerifier_=</a>, <a href="#revalidate" target="contentFrame" class="scala/swing/Component">scala.swing.Component.revalidate</a>, <a href="#requestFocus" target="contentFrame" class="scala/swing/Component">scala.swing.Component.requestFocus</a>, <a href="#paintComponent" target="contentFrame" class="scala/swing/Component">scala.swing.Component.paintComponent</a>, <a href="#paint" target="contentFrame" class="scala/swing/Component">scala.swing.Component.paint</a>, <a href="#toString" target="contentFrame" class="scala/swing/Component">scala.swing.Component.toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#subscribe" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.subscribe</a>, <a href="#unsubscribe" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.unsubscribe</a>, <a href="#publish" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.publish</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#listenTo" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.listenTo</a>, <a href="#deafTo" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.deafTo</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#self" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.self</a>, <a href="#foreground" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.foreground</a>, <a href="#foreground_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.foreground_=</a>, <a href="#background" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.background</a>, <a href="#background_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.background_=</a>, <a href="#minimumSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.minimumSize</a>, <a href="#minimumSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.minimumSize_=</a>, <a href="#maximumSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.maximumSize</a>, <a href="#maximumSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.maximumSize_=</a>, <a href="#preferredSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize</a>, <a href="#preferredSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize_=</a>, <a href="#preferredSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize_=</a>, <a href="#font" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.font</a>, <a href="#font_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.font_=</a>, <a href="#locationOnScreen" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.locationOnScreen</a>, <a href="#location" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.location</a>, <a href="#bounds" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.bounds</a>, <a href="#size" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size</a>, <a href="#size_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size_=</a>, <a href="#size_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size_=</a>, <a href="#locale" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.locale</a>, <a href="#toolkit" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.toolkit</a>, <a href="#cursor" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.cursor</a>, <a href="#cursor_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.cursor_=</a>, <a href="#visible" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.visible</a>, <a href="#visible_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.visible_=</a>, <a href="#showing" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.showing</a>, <a href="#repaint" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.repaint</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Proxy">scala.Proxy</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#hashCode" target="contentFrame" class="scala/Proxy">scala.Proxy.hashCode</a>, <a href="#equals" target="contentFrame" class="scala/Proxy">scala.Proxy.equals</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="scala.swing.Component#Mouse">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">Mouse</span><span class="result">: <span class="extype" name="scala.swing.Component.mouse">mouse</span></span>
+      </span>
+      </h4>
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="mnu"></a><dl>
-      <dt>
+    </li><li name="scala.swing.UIElement#background">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">background</span><span class="result">: <span class="extype" name="java.awt.Color">Color</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#background_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">background_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Color">Color</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#border">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">border</span><span class="result">: <span class="extype" name="javax.swing.border.Border">Border</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#border_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">border_=</span><span class="params">(<span name="b">b: <span class="extype" name="javax.swing.border.Border">Border</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#bounds">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">bounds</span><span class="result">: <span class="extype" name="java.awt.Rectangle">Rectangle</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.SequentialContainer.Wrapper#contents">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">contents</span><span class="result">: <span class="extype" name="scala.collection.mutable.Buffer">Buffer</span>[<span class="extype" name="scala.swing.Component">Component</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#cursor">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cursor</span><span class="result">: <span class="extype" name="java.awt.Cursor">Cursor</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#cursor_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cursor_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Cursor">Cursor</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#deafTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">deafTo</span><span class="params">(<span name="ps">ps: <span class="extype" name="scala.swing.Publisher">Publisher</span>*</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#displayable">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">displayable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#enabled">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">enabled</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#enabled_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">enabled_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="that">that: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.Component#focusable">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">focusable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#focusable_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">focusable_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#font">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">font</span><span class="result">: <span class="extype" name="java.awt.Font">Font</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#font_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">font_=</span><span class="params">(<span name="f">f: <span class="extype" name="java.awt.Font">Font</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#foreground">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">foreground</span><span class="result">: <span class="extype" name="java.awt.Color">Color</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#foreground_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">foreground_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Color">Color</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#hasFocus">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hasFocus</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.UIElement#ignoreRepaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">ignoreRepaint</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#ignoreRepaint_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">ignoreRepaint_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#initP">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">initP</span><span class="result">: <span class="extype" name="javax.swing.JComponent">JComponent</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#inputVerifier">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">inputVerifier</span><span class="result">: (MenuPanel.this.type) ⇒ <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#inputVerifier_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">inputVerifier_=</span><span class="params">(<span name="v">v: (MenuPanel.this.type) ⇒ <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#listenTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">listenTo</span><span class="params">(<span name="ps">ps: <span class="extype" name="scala.swing.Publisher">Publisher</span>*</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#locale">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">locale</span><span class="result">: <span class="extype" name="java.util.Locale">Locale</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#location">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">location</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#locationOnScreen">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">locationOnScreen</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#maximumSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximumSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#maximumSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximumSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#minimumSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">minimumSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#minimumSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">minimumSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.MenuPanel#mnu">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">mnu</span><span class="result">: <span class="extype" name="scala.swing.MenuBar">MenuBar</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#onFirstSubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">onFirstSubscribe</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#onLastUnsubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">onLastUnsubscribe</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#opaque">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">opaque</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#opaque_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">opaque_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#paint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">paint</span><span class="params">(<span name="g">g: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.BoxPanel#peer">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">peer</span><span class="result">: <span class="extype" name="javax.swing.JPanel">JPanel</span> with <span class="extype" name="scala.swing.Component.SuperMixin">SuperMixin</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize_=</span><span class="params">(<span name="xy">xy: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Publisher#publish">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">publish</span><span class="params">(<span name="e">e: <span class="extype" name="scala.swing.event.Event">Event</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#reactions">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">reactions</span><span class="result">: <span class="extype" name="scala.swing.Reactions">Reactions</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#repaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">repaint</span><span class="params">(<span name="rect">rect: <span class="extype" name="java.awt.Rectangle">Rectangle</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#repaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">repaint</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#requestFocus">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">requestFocus</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#requestFocusInWindow">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">requestFocusInWindow</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#revalidate">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">revalidate</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#self">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">self</span><span class="result">: <span class="extype" name="java.awt.Component">Component</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#showing">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">showing</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size_=</span><span class="params">(<span name="xy">xy: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size_=</span><span class="params">(<span name="dim">dim: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LazyPublisher#subscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">subscribe</span><span class="params">(<span name="listener">listener: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.swing.event.Event">Event</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Component ⇐ Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.UIElement#toolkit">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toolkit</span><span class="result">: <span class="extype" name="java.awt.Toolkit">Toolkit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#tooltip">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">tooltip</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#tooltip_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">tooltip_=</span><span class="params">(<span name="t">t: <span class="extype" name="java.lang.String">String</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LazyPublisher#unsubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">unsubscribe</span><span class="params">(<span name="listener">listener: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.swing.event.Event">Event</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#visible">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">visible</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#visible_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">visible_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#xLayoutAlignment">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">xLayoutAlignment</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#xLayoutAlignment_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">xLayoutAlignment_=</span><span class="params">(<span name="x">x: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#yLayoutAlignment">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">yLayoutAlignment</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#yLayoutAlignment_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">yLayoutAlignment_=</span><span class="params">(<span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>val</code>
-        <em>mnu</em> : <a href="" target="contentFrame" class="scala/swing/MenuBar">scala.swing.MenuBar</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.gui.MenuPanel#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">MenuPanel</span><span class="params">(<span name="container">container: <a href="Container.html" class="extype" name="graphyx.gui.Container">Container</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.BoxPanel#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">MenuPanel</span><span class="params">(<span name="orientation">orientation: <span class="extype" name="scala.Enumeration.Value">Value</span></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Panel#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">MenuPanel</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/gui/OptionsPanel.html b/doc/graphyx/gui/OptionsPanel.html
index a666b5d..cbb1a2b 100644
--- a/doc/graphyx/gui/OptionsPanel.html
+++ b/doc/graphyx/gui/OptionsPanel.html
@@ -1,665 +1,958 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class OptionsPanel in graphyx.gui</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.gui.OptionsPanel</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/gui$package.html" target="_self">graphyx.gui</a>
-        <br></br>
-        <span class="entity">class  OptionsPanel</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/gui/OptionsPanel"><code>graphyx/gui/OptionsPanel.scala</code></a>]
-      </div><hr></hr>
-      <a name="OptionsPanel"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>class</code>
-        <em>OptionsPanel</em>(<em>container</em> : <a href="../../graphyx/gui/Container.html" target="_self">Container</a>)
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/swing/GridPanel">scala.swing.GridPanel</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">gui</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/OptionsPanel.html#chckCD" target="_self">chckCD</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/CheckBox">scala.swing.CheckBox</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/OptionsPanel.html#chckDrawAABBs" target="_self">chckDrawAABBs</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/CheckBox">scala.swing.CheckBox</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/OptionsPanel.html#chckDrawBodies" target="_self">chckDrawBodies</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/CheckBox">scala.swing.CheckBox</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/OptionsPanel.html#chckDrawCollisions" target="_self">chckDrawCollisions</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/CheckBox">scala.swing.CheckBox</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/OptionsPanel.html#chckDrawJoints" target="_self">chckDrawJoints</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/CheckBox">scala.swing.CheckBox</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/OptionsPanel.html#chckDrawPairs" target="_self">chckDrawPairs</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/CheckBox">scala.swing.CheckBox</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/OptionsPanel.html#chckDrawShapes" target="_self">chckDrawShapes</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/CheckBox">scala.swing.CheckBox</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/OptionsPanel.html#chckPC" target="_self">chckPC</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/CheckBox">scala.swing.CheckBox</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/OptionsPanel.html#chckTrace" target="_self">chckTrace</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/CheckBox">scala.swing.CheckBox</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/OptionsPanel.html#components" target="_self">components</a></em>
-         : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a>]
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/OptionsPanel.html#lblCD" target="_self">lblCD</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/OptionsPanel.html#lblDraw" target="_self">lblDraw</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/OptionsPanel.html#lblDrawAABBs" target="_self">lblDrawAABBs</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/OptionsPanel.html#lblDrawBodies" target="_self">lblDrawBodies</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/OptionsPanel.html#lblDrawCollisions" target="_self">lblDrawCollisions</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/OptionsPanel.html#lblDrawJoints" target="_self">lblDrawJoints</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/OptionsPanel.html#lblDrawPairs" target="_self">lblDrawPairs</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/OptionsPanel.html#lblDrawShapes" target="_self">lblDrawShapes</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/OptionsPanel.html#lblIterations" target="_self">lblIterations</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/OptionsPanel.html#lblPC" target="_self">lblPC</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/OptionsPanel.html#lblTimeStep" target="_self">lblTimeStep</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/OptionsPanel.html#lblTrace" target="_self">lblTrace</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/OptionsPanel.html#txtIterations" target="_self">txtIterations</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/TextField">scala.swing.TextField</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/OptionsPanel.html#txtTimeStep" target="_self">txtTimeStep</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/TextField">scala.swing.TextField</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/GridPanel">scala.swing.GridPanel</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#peer" target="contentFrame" class="scala/swing/GridPanel">scala.swing.GridPanel.peer</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/SequentialContainer/Wrapper">scala.swing.SequentialContainer.Wrapper</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#contents" target="contentFrame" class="scala/swing/SequentialContainer/Wrapper">scala.swing.SequentialContainer.Wrapper.contents</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Container/Wrapper">scala.swing.Container.Wrapper</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#_contents" target="contentFrame" class="scala/swing/Container/Wrapper">scala.swing.Container.Wrapper._contents</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#initP" target="contentFrame" class="scala/swing/Component">scala.swing.Component.initP</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#listeners" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.listeners</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#reactions" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.reactions</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/OptionsPanel.html#update%28%29" target="_self">update</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/GridPanel">scala.swing.GridPanel</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#rows" target="contentFrame" class="scala/swing/GridPanel">scala.swing.GridPanel.rows</a>, <a href="#rows_=" target="contentFrame" class="scala/swing/GridPanel">scala.swing.GridPanel.rows_=</a>, <a href="#columns" target="contentFrame" class="scala/swing/GridPanel">scala.swing.GridPanel.columns</a>, <a href="#columns_=" target="contentFrame" class="scala/swing/GridPanel">scala.swing.GridPanel.columns_=</a>, <a href="#vGap" target="contentFrame" class="scala/swing/GridPanel">scala.swing.GridPanel.vGap</a>, <a href="#vGap_=" target="contentFrame" class="scala/swing/GridPanel">scala.swing.GridPanel.vGap_=</a>, <a href="#hGap" target="contentFrame" class="scala/swing/GridPanel">scala.swing.GridPanel.hGap</a>, <a href="#hGap_=" target="contentFrame" class="scala/swing/GridPanel">scala.swing.GridPanel.hGap_=</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#xLayoutAlignment" target="contentFrame" class="scala/swing/Component">scala.swing.Component.xLayoutAlignment</a>, <a href="#xLayoutAlignment_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.xLayoutAlignment_=</a>, <a href="#yLayoutAlignment" target="contentFrame" class="scala/swing/Component">scala.swing.Component.yLayoutAlignment</a>, <a href="#yLayoutAlignment_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.yLayoutAlignment_=</a>, <a href="#border" target="contentFrame" class="scala/swing/Component">scala.swing.Component.border</a>, <a href="#border_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.border_=</a>, <a href="#opaque" target="contentFrame" class="scala/swing/Component">scala.swing.Component.opaque</a>, <a href="#opaque_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.opaque_=</a>, <a href="#enabled" target="contentFrame" class="scala/swing/Component">scala.swing.Component.enabled</a>, <a href="#enabled_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.enabled_=</a>, <a href="#tooltip" target="contentFrame" class="scala/swing/Component">scala.swing.Component.tooltip</a>, <a href="#tooltip_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.tooltip_=</a>, <a href="#inputVerifier" target="contentFrame" class="scala/swing/Component">scala.swing.Component.inputVerifier</a>, <a href="#inputVerifier_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.inputVerifier_=</a>, <a href="#revalidate" target="contentFrame" class="scala/swing/Component">scala.swing.Component.revalidate</a>, <a href="#requestFocus" target="contentFrame" class="scala/swing/Component">scala.swing.Component.requestFocus</a>, <a href="#paintComponent" target="contentFrame" class="scala/swing/Component">scala.swing.Component.paintComponent</a>, <a href="#paint" target="contentFrame" class="scala/swing/Component">scala.swing.Component.paint</a>, <a href="#toString" target="contentFrame" class="scala/swing/Component">scala.swing.Component.toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#subscribe" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.subscribe</a>, <a href="#unsubscribe" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.unsubscribe</a>, <a href="#publish" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.publish</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#listenTo" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.listenTo</a>, <a href="#deafTo" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.deafTo</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#self" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.self</a>, <a href="#foreground" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.foreground</a>, <a href="#foreground_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.foreground_=</a>, <a href="#background" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.background</a>, <a href="#background_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.background_=</a>, <a href="#minimumSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.minimumSize</a>, <a href="#minimumSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.minimumSize_=</a>, <a href="#maximumSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.maximumSize</a>, <a href="#maximumSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.maximumSize_=</a>, <a href="#preferredSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize</a>, <a href="#preferredSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize_=</a>, <a href="#preferredSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize_=</a>, <a href="#font" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.font</a>, <a href="#font_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.font_=</a>, <a href="#locationOnScreen" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.locationOnScreen</a>, <a href="#location" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.location</a>, <a href="#bounds" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.bounds</a>, <a href="#size" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size</a>, <a href="#size_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size_=</a>, <a href="#size_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size_=</a>, <a href="#locale" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.locale</a>, <a href="#toolkit" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.toolkit</a>, <a href="#cursor" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.cursor</a>, <a href="#cursor_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.cursor_=</a>, <a href="#visible" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.visible</a>, <a href="#visible_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.visible_=</a>, <a href="#showing" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.showing</a>, <a href="#repaint" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.repaint</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Proxy">scala.Proxy</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#hashCode" target="contentFrame" class="scala/Proxy">scala.Proxy.hashCode</a>, <a href="#equals" target="contentFrame" class="scala/Proxy">scala.Proxy.equals</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>OptionsPanel</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">OptionsPanel</span><span class="result"> extends <span class="extype" name="scala.swing.GridPanel">GridPanel</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="lblTimeStep"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>lblTimeStep</em> : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="txtTimeStep"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>txtTimeStep</em> : <a href="" target="contentFrame" class="scala/swing/TextField">scala.swing.TextField</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="lblIterations"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>lblIterations</em> : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="txtIterations"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>txtIterations</em> : <a href="" target="contentFrame" class="scala/swing/TextField">scala.swing.TextField</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="lblCD"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>lblCD</em> : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="chckCD"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>chckCD</em> : <a href="" target="contentFrame" class="scala/swing/CheckBox">scala.swing.CheckBox</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="lblPC"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>lblPC</em> : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="chckPC"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>chckPC</em> : <a href="" target="contentFrame" class="scala/swing/CheckBox">scala.swing.CheckBox</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="lblDraw"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>lblDraw</em> : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="lblDrawBodies"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>lblDrawBodies</em> : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="chckDrawBodies"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>chckDrawBodies</em> : <a href="" target="contentFrame" class="scala/swing/CheckBox">scala.swing.CheckBox</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="lblDrawShapes"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>lblDrawShapes</em> : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="chckDrawShapes"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>chckDrawShapes</em> : <a href="" target="contentFrame" class="scala/swing/CheckBox">scala.swing.CheckBox</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="lblDrawJoints"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>lblDrawJoints</em> : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="chckDrawJoints"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>chckDrawJoints</em> : <a href="" target="contentFrame" class="scala/swing/CheckBox">scala.swing.CheckBox</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="lblDrawAABBs"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>lblDrawAABBs</em> : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="chckDrawAABBs"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>chckDrawAABBs</em> : <a href="" target="contentFrame" class="scala/swing/CheckBox">scala.swing.CheckBox</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="lblDrawPairs"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>lblDrawPairs</em> : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="chckDrawPairs"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>chckDrawPairs</em> : <a href="" target="contentFrame" class="scala/swing/CheckBox">scala.swing.CheckBox</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="lblDrawCollisions"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>lblDrawCollisions</em> : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="chckDrawCollisions"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>chckDrawCollisions</em> : <a href="" target="contentFrame" class="scala/swing/CheckBox">scala.swing.CheckBox</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="lblTrace"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>lblTrace</em> : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="chckTrace"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>chckTrace</em> : <a href="" target="contentFrame" class="scala/swing/CheckBox">scala.swing.CheckBox</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="components"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>components</em> : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a>]
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="update%28%29"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.swing.GridPanel">GridPanel</li><li class="in" name="scala.swing.SequentialContainer.Wrapper">Wrapper</li><li class="in" name="scala.swing.SequentialContainer">SequentialContainer</li><li class="in" name="scala.swing.Panel">Panel</li><li class="in" name="scala.swing.Container.Wrapper">Wrapper</li><li class="in" name="scala.swing.Container">Container</li><li class="in" name="scala.swing.Component">Component</li><li class="in" name="scala.swing.UIElement">UIElement</li><li class="in" name="scala.swing.LazyPublisher">LazyPublisher</li><li class="in" name="scala.swing.Publisher">Publisher</li><li class="in" name="scala.swing.Reactor">Reactor</li><li class="in" name="scala.Proxy">Proxy</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="scala.swing.Component#Mouse">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">Mouse</span><span class="result">: <span class="extype" name="scala.swing.Component.mouse">mouse</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#background">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">background</span><span class="result">: <span class="extype" name="java.awt.Color">Color</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#background_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">background_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Color">Color</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#border">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">border</span><span class="result">: <span class="extype" name="javax.swing.border.Border">Border</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#border_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">border_=</span><span class="params">(<span name="b">b: <span class="extype" name="javax.swing.border.Border">Border</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#bounds">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">bounds</span><span class="result">: <span class="extype" name="java.awt.Rectangle">Rectangle</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.OptionsPanel#chckCD">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">chckCD</span><span class="result">: <span class="extype" name="scala.swing.CheckBox">CheckBox</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.OptionsPanel#chckDrawAABBs">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">chckDrawAABBs</span><span class="result">: <span class="extype" name="scala.swing.CheckBox">CheckBox</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.OptionsPanel#chckDrawBodies">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">chckDrawBodies</span><span class="result">: <span class="extype" name="scala.swing.CheckBox">CheckBox</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.OptionsPanel#chckDrawCollisions">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">chckDrawCollisions</span><span class="result">: <span class="extype" name="scala.swing.CheckBox">CheckBox</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.OptionsPanel#chckDrawJoints">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">chckDrawJoints</span><span class="result">: <span class="extype" name="scala.swing.CheckBox">CheckBox</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.OptionsPanel#chckDrawPairs">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">chckDrawPairs</span><span class="result">: <span class="extype" name="scala.swing.CheckBox">CheckBox</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.OptionsPanel#chckDrawShapes">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">chckDrawShapes</span><span class="result">: <span class="extype" name="scala.swing.CheckBox">CheckBox</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.OptionsPanel#chckPC">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">chckPC</span><span class="result">: <span class="extype" name="scala.swing.CheckBox">CheckBox</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.OptionsPanel#chckTrace">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">chckTrace</span><span class="result">: <span class="extype" name="scala.swing.CheckBox">CheckBox</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.GridPanel#columns">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">columns</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.GridPanel#columns_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">columns_=</span><span class="params">(<span name="n">n: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.OptionsPanel#components">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">components</span><span class="result">: <span class="extype" name="scala.collection.immutable.List">List</span>[<span class="extype" name="scala.swing.Component">Component</span> {...}]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.SequentialContainer.Wrapper#contents">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">contents</span><span class="result">: <span class="extype" name="scala.collection.mutable.Buffer">Buffer</span>[<span class="extype" name="scala.swing.Component">Component</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#cursor">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cursor</span><span class="result">: <span class="extype" name="java.awt.Cursor">Cursor</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#cursor_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cursor_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Cursor">Cursor</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#deafTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">deafTo</span><span class="params">(<span name="ps">ps: <span class="extype" name="scala.swing.Publisher">Publisher</span>*</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#displayable">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">displayable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#enabled">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">enabled</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#enabled_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">enabled_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="that">that: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.Component#focusable">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">focusable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#focusable_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">focusable_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#font">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">font</span><span class="result">: <span class="extype" name="java.awt.Font">Font</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#font_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">font_=</span><span class="params">(<span name="f">f: <span class="extype" name="java.awt.Font">Font</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#foreground">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">foreground</span><span class="result">: <span class="extype" name="java.awt.Color">Color</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#foreground_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">foreground_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Color">Color</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.GridPanel#hGap">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hGap</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.GridPanel#hGap_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hGap_=</span><span class="params">(<span name="n">n: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#hasFocus">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hasFocus</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.UIElement#ignoreRepaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">ignoreRepaint</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#ignoreRepaint_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">ignoreRepaint_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#initP">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">initP</span><span class="result">: <span class="extype" name="javax.swing.JComponent">JComponent</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#inputVerifier">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">inputVerifier</span><span class="result">: (OptionsPanel.this.type) ⇒ <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#inputVerifier_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">inputVerifier_=</span><span class="params">(<span name="v">v: (OptionsPanel.this.type) ⇒ <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.OptionsPanel#lblCD">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">lblCD</span><span class="result">: <span class="extype" name="scala.swing.Label">Label</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.OptionsPanel#lblDraw">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">lblDraw</span><span class="result">: <span class="extype" name="scala.swing.Label">Label</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.OptionsPanel#lblDrawAABBs">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">lblDrawAABBs</span><span class="result">: <span class="extype" name="scala.swing.Label">Label</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.OptionsPanel#lblDrawBodies">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">lblDrawBodies</span><span class="result">: <span class="extype" name="scala.swing.Label">Label</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.OptionsPanel#lblDrawCollisions">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">lblDrawCollisions</span><span class="result">: <span class="extype" name="scala.swing.Label">Label</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.OptionsPanel#lblDrawJoints">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">lblDrawJoints</span><span class="result">: <span class="extype" name="scala.swing.Label">Label</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.OptionsPanel#lblDrawPairs">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">lblDrawPairs</span><span class="result">: <span class="extype" name="scala.swing.Label">Label</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.OptionsPanel#lblDrawShapes">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">lblDrawShapes</span><span class="result">: <span class="extype" name="scala.swing.Label">Label</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.OptionsPanel#lblIterations">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">lblIterations</span><span class="result">: <span class="extype" name="scala.swing.Label">Label</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.OptionsPanel#lblPC">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">lblPC</span><span class="result">: <span class="extype" name="scala.swing.Label">Label</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.OptionsPanel#lblTimeStep">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">lblTimeStep</span><span class="result">: <span class="extype" name="scala.swing.Label">Label</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.OptionsPanel#lblTrace">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">lblTrace</span><span class="result">: <span class="extype" name="scala.swing.Label">Label</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#listenTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">listenTo</span><span class="params">(<span name="ps">ps: <span class="extype" name="scala.swing.Publisher">Publisher</span>*</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#locale">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">locale</span><span class="result">: <span class="extype" name="java.util.Locale">Locale</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#location">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">location</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#locationOnScreen">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">locationOnScreen</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#maximumSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximumSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#maximumSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximumSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#minimumSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">minimumSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#minimumSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">minimumSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#onFirstSubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">onFirstSubscribe</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#onLastUnsubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">onLastUnsubscribe</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#opaque">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">opaque</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#opaque_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">opaque_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#paint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">paint</span><span class="params">(<span name="g">g: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.GridPanel#peer">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">peer</span><span class="result">: <span class="extype" name="javax.swing.JPanel">JPanel</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize_=</span><span class="params">(<span name="xy">xy: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Publisher#publish">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">publish</span><span class="params">(<span name="e">e: <span class="extype" name="scala.swing.event.Event">Event</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#reactions">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">reactions</span><span class="result">: <span class="extype" name="scala.swing.Reactions">Reactions</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#repaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">repaint</span><span class="params">(<span name="rect">rect: <span class="extype" name="java.awt.Rectangle">Rectangle</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#repaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">repaint</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#requestFocus">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">requestFocus</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#requestFocusInWindow">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">requestFocusInWindow</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#revalidate">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">revalidate</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.GridPanel#rows">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">rows</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.GridPanel#rows_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">rows_=</span><span class="params">(<span name="n">n: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#self">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">self</span><span class="result">: <span class="extype" name="java.awt.Component">Component</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#showing">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">showing</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size_=</span><span class="params">(<span name="xy">xy: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size_=</span><span class="params">(<span name="dim">dim: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LazyPublisher#subscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">subscribe</span><span class="params">(<span name="listener">listener: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.swing.event.Event">Event</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Component ⇐ Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.UIElement#toolkit">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toolkit</span><span class="result">: <span class="extype" name="java.awt.Toolkit">Toolkit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#tooltip">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">tooltip</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#tooltip_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">tooltip_=</span><span class="params">(<span name="t">t: <span class="extype" name="java.lang.String">String</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.OptionsPanel#txtIterations">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">txtIterations</span><span class="result">: <span class="extype" name="scala.swing.TextField">TextField</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.OptionsPanel#txtTimeStep">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">txtTimeStep</span><span class="result">: <span class="extype" name="scala.swing.TextField">TextField</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LazyPublisher#unsubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">unsubscribe</span><span class="params">(<span name="listener">listener: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.swing.event.Event">Event</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.OptionsPanel#update">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">update</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.GridPanel#vGap">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">vGap</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.GridPanel#vGap_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">vGap_=</span><span class="params">(<span name="n">n: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#visible">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">visible</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#visible_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">visible_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#xLayoutAlignment">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">xLayoutAlignment</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#xLayoutAlignment_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">xLayoutAlignment_=</span><span class="params">(<span name="x">x: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#yLayoutAlignment">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">yLayoutAlignment</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#yLayoutAlignment_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">yLayoutAlignment_=</span><span class="params">(<span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.gui.OptionsPanel#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">OptionsPanel</span><span class="params">(<span name="container">container: <a href="Container.html" class="extype" name="graphyx.gui.Container">Container</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.GridPanel#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">OptionsPanel</span><span class="params">(<span name="rows0">rows0: <span class="extype" name="scala.Int">Int</span></span>, <span name="cols0">cols0: <span class="extype" name="scala.Int">Int</span></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Panel#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">OptionsPanel</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>update</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/gui/PopupMenu.html b/doc/graphyx/gui/PopupMenu.html
index 96c8a2e..b404006 100644
--- a/doc/graphyx/gui/PopupMenu.html
+++ b/doc/graphyx/gui/PopupMenu.html
@@ -1,207 +1,688 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class PopupMenu in graphyx.gui</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.gui.PopupMenu</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/gui$package.html" target="_self">graphyx.gui</a>
-        <br></br>
-        <span class="entity">class  PopupMenu</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/gui/PopupMenu"><code>graphyx/gui/PopupMenu.scala</code></a>]
-      </div><hr></hr>
-      <a name="PopupMenu"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>class</code>
-        <em>PopupMenu</em>
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a></dd>
-    </dl><dl>
-      <dt style="margin:10px 0 0 20px;"><b>Direct Known Subclasses:</b></dt>
-      <dd><a href="../../graphyx/gui/BodyPopup.html" target="_self">BodyPopup</a></dd>
-      </dl><hr></hr>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">gui</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override lazy val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/PopupMenu.html#peer" target="_self">peer</a></em>
-         : <a href="" target="contentFrame" class="javax/swing/JPopupMenu">javax.swing.JPopupMenu</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#initP" target="contentFrame" class="scala/swing/Component">scala.swing.Component.initP</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#listeners" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.listeners</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#reactions" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.reactions</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/PopupMenu.html#add%28scala.swing.MenuItem%29" target="_self">add</a></em>
-        (<em>item</em> : <a href="" target="contentFrame" class="scala/swing/MenuItem">scala.swing.MenuItem</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>PopupMenu</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">PopupMenu</span><span class="result"> extends <span class="extype" name="scala.swing.Component">Component</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      <div class="block">
+                known subclasses: <a href="BodyPopup.html">BodyPopup</a>
+              </div>
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.swing.Component">Component</li><li class="in" name="scala.swing.UIElement">UIElement</li><li class="in" name="scala.swing.LazyPublisher">LazyPublisher</li><li class="in" name="scala.swing.Publisher">Publisher</li><li class="in" name="scala.swing.Reactor">Reactor</li><li class="in" name="scala.Proxy">Proxy</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/PopupMenu.html#setVisible%28Boolean%29" target="_self">setVisible</a></em>
-        (<em>visible</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
         
         
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#xLayoutAlignment" target="contentFrame" class="scala/swing/Component">scala.swing.Component.xLayoutAlignment</a>, <a href="#xLayoutAlignment_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.xLayoutAlignment_=</a>, <a href="#yLayoutAlignment" target="contentFrame" class="scala/swing/Component">scala.swing.Component.yLayoutAlignment</a>, <a href="#yLayoutAlignment_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.yLayoutAlignment_=</a>, <a href="#border" target="contentFrame" class="scala/swing/Component">scala.swing.Component.border</a>, <a href="#border_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.border_=</a>, <a href="#opaque" target="contentFrame" class="scala/swing/Component">scala.swing.Component.opaque</a>, <a href="#opaque_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.opaque_=</a>, <a href="#enabled" target="contentFrame" class="scala/swing/Component">scala.swing.Component.enabled</a>, <a href="#enabled_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.enabled_=</a>, <a href="#tooltip" target="contentFrame" class="scala/swing/Component">scala.swing.Component.tooltip</a>, <a href="#tooltip_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.tooltip_=</a>, <a href="#inputVerifier" target="contentFrame" class="scala/swing/Component">scala.swing.Component.inputVerifier</a>, <a href="#inputVerifier_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.inputVerifier_=</a>, <a href="#revalidate" target="contentFrame" class="scala/swing/Component">scala.swing.Component.revalidate</a>, <a href="#requestFocus" target="contentFrame" class="scala/swing/Component">scala.swing.Component.requestFocus</a>, <a href="#paintComponent" target="contentFrame" class="scala/swing/Component">scala.swing.Component.paintComponent</a>, <a href="#paint" target="contentFrame" class="scala/swing/Component">scala.swing.Component.paint</a>, <a href="#toString" target="contentFrame" class="scala/swing/Component">scala.swing.Component.toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#subscribe" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.subscribe</a>, <a href="#unsubscribe" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.unsubscribe</a>, <a href="#publish" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.publish</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#listenTo" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.listenTo</a>, <a href="#deafTo" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.deafTo</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#self" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.self</a>, <a href="#foreground" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.foreground</a>, <a href="#foreground_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.foreground_=</a>, <a href="#background" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.background</a>, <a href="#background_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.background_=</a>, <a href="#minimumSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.minimumSize</a>, <a href="#minimumSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.minimumSize_=</a>, <a href="#maximumSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.maximumSize</a>, <a href="#maximumSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.maximumSize_=</a>, <a href="#preferredSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize</a>, <a href="#preferredSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize_=</a>, <a href="#preferredSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize_=</a>, <a href="#font" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.font</a>, <a href="#font_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.font_=</a>, <a href="#locationOnScreen" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.locationOnScreen</a>, <a href="#location" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.location</a>, <a href="#bounds" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.bounds</a>, <a href="#size" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size</a>, <a href="#size_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size_=</a>, <a href="#size_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size_=</a>, <a href="#locale" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.locale</a>, <a href="#toolkit" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.toolkit</a>, <a href="#cursor" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.cursor</a>, <a href="#cursor_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.cursor_=</a>, <a href="#visible" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.visible</a>, <a href="#visible_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.visible_=</a>, <a href="#showing" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.showing</a>, <a href="#repaint" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.repaint</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Proxy">scala.Proxy</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#hashCode" target="contentFrame" class="scala/Proxy">scala.Proxy.hashCode</a>, <a href="#equals" target="contentFrame" class="scala/Proxy">scala.Proxy.equals</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="scala.swing.Component#Mouse">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">Mouse</span><span class="result">: <span class="extype" name="scala.swing.Component.mouse">mouse</span></span>
+      </span>
+      </h4>
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="peer"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>lazy val</code>
-        <em>peer</em> : <a href="" target="contentFrame" class="javax/swing/JPopupMenu">javax.swing.JPopupMenu</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a>.<a href="#peer" target="contentFrame" class="scala/swing/Component">scala.swing.Component.peer</a>
-        </dd>
-      </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="add%28scala.swing.MenuItem%29"></a><dl>
-      <dt>
+    </li><li name="graphyx.gui.PopupMenu#add">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">add</span><span class="params">(<span name="item">item: <span class="extype" name="scala.swing.MenuItem">MenuItem</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#background">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">background</span><span class="result">: <span class="extype" name="java.awt.Color">Color</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#background_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">background_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Color">Color</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#border">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">border</span><span class="result">: <span class="extype" name="javax.swing.border.Border">Border</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#border_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">border_=</span><span class="params">(<span name="b">b: <span class="extype" name="javax.swing.border.Border">Border</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#bounds">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">bounds</span><span class="result">: <span class="extype" name="java.awt.Rectangle">Rectangle</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#cursor">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cursor</span><span class="result">: <span class="extype" name="java.awt.Cursor">Cursor</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#cursor_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cursor_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Cursor">Cursor</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#deafTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">deafTo</span><span class="params">(<span name="ps">ps: <span class="extype" name="scala.swing.Publisher">Publisher</span>*</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#displayable">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">displayable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#enabled">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">enabled</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#enabled_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">enabled_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="that">that: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.Component#focusable">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">focusable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#focusable_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">focusable_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#font">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">font</span><span class="result">: <span class="extype" name="java.awt.Font">Font</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#font_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">font_=</span><span class="params">(<span name="f">f: <span class="extype" name="java.awt.Font">Font</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#foreground">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">foreground</span><span class="result">: <span class="extype" name="java.awt.Color">Color</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#foreground_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">foreground_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Color">Color</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#hasFocus">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hasFocus</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.UIElement#ignoreRepaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">ignoreRepaint</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#ignoreRepaint_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">ignoreRepaint_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#initP">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">initP</span><span class="result">: <span class="extype" name="javax.swing.JComponent">JComponent</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#inputVerifier">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">inputVerifier</span><span class="result">: (PopupMenu.this.type) ⇒ <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#inputVerifier_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">inputVerifier_=</span><span class="params">(<span name="v">v: (PopupMenu.this.type) ⇒ <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#listenTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">listenTo</span><span class="params">(<span name="ps">ps: <span class="extype" name="scala.swing.Publisher">Publisher</span>*</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#locale">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">locale</span><span class="result">: <span class="extype" name="java.util.Locale">Locale</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#location">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">location</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#locationOnScreen">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">locationOnScreen</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#maximumSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximumSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#maximumSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximumSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#minimumSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">minimumSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#minimumSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">minimumSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#onFirstSubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">onFirstSubscribe</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#onLastUnsubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">onLastUnsubscribe</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#opaque">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">opaque</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#opaque_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">opaque_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#paint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">paint</span><span class="params">(<span name="g">g: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.PopupMenu#peer">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">peer</span><span class="result">: <span class="extype" name="javax.swing.JPopupMenu">JPopupMenu</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize_=</span><span class="params">(<span name="xy">xy: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Publisher#publish">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">publish</span><span class="params">(<span name="e">e: <span class="extype" name="scala.swing.event.Event">Event</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#reactions">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">reactions</span><span class="result">: <span class="extype" name="scala.swing.Reactions">Reactions</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#repaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">repaint</span><span class="params">(<span name="rect">rect: <span class="extype" name="java.awt.Rectangle">Rectangle</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#repaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">repaint</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#requestFocus">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">requestFocus</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#requestFocusInWindow">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">requestFocusInWindow</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#revalidate">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">revalidate</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#self">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">self</span><span class="result">: <span class="extype" name="java.awt.Component">Component</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.PopupMenu#setVisible">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">setVisible</span><span class="params">(<span name="visible">visible: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#showing">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">showing</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size_=</span><span class="params">(<span name="xy">xy: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size_=</span><span class="params">(<span name="dim">dim: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LazyPublisher#subscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">subscribe</span><span class="params">(<span name="listener">listener: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.swing.event.Event">Event</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Component ⇐ Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.UIElement#toolkit">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toolkit</span><span class="result">: <span class="extype" name="java.awt.Toolkit">Toolkit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#tooltip">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">tooltip</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#tooltip_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">tooltip_=</span><span class="params">(<span name="t">t: <span class="extype" name="java.lang.String">String</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LazyPublisher#unsubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">unsubscribe</span><span class="params">(<span name="listener">listener: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.swing.event.Event">Event</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#visible">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">visible</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#visible_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">visible_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#xLayoutAlignment">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">xLayoutAlignment</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#xLayoutAlignment_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">xLayoutAlignment_=</span><span class="params">(<span name="x">x: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#yLayoutAlignment">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">yLayoutAlignment</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#yLayoutAlignment_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">yLayoutAlignment_=</span><span class="params">(<span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>add</em>(<em>item</em> : <a href="" target="contentFrame" class="scala/swing/MenuItem">scala.swing.MenuItem</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="setVisible%28Boolean%29"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.gui.PopupMenu#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">PopupMenu</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>setVisible</em>(<em>visible</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/gui/ShapeInfoPanel.html b/doc/graphyx/gui/ShapeInfoPanel.html
index 452968a..4e9b1c7 100644
--- a/doc/graphyx/gui/ShapeInfoPanel.html
+++ b/doc/graphyx/gui/ShapeInfoPanel.html
@@ -1,262 +1,798 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class ShapeInfoPanel in graphyx.gui</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.gui.ShapeInfoPanel</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/gui$package.html" target="_self">graphyx.gui</a>
-        <br></br>
-        <span class="entity">class  ShapeInfoPanel</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/gui/ShapeInfoPanel"><code>graphyx/gui/ShapeInfoPanel.scala</code></a>]
-      </div><hr></hr>
-      <a name="ShapeInfoPanel"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>class</code>
-        <em>ShapeInfoPanel</em>(<em>container</em> : <a href="../../graphyx/gui/Container.html" target="_self">Container</a>)
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/swing/GridPanel">scala.swing.GridPanel</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">gui</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/ShapeInfoPanel.html#components" target="_self">components</a></em>
-         : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>]
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/ShapeInfoPanel.html#lblBody" target="_self">lblBody</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/ShapeInfoPanel.html#lblShape" target="_self">lblShape</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/ShapeInfoPanel.html#lblValBody" target="_self">lblValBody</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/ShapeInfoPanel.html#lblValShape" target="_self">lblValShape</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/GridPanel">scala.swing.GridPanel</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#peer" target="contentFrame" class="scala/swing/GridPanel">scala.swing.GridPanel.peer</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/SequentialContainer/Wrapper">scala.swing.SequentialContainer.Wrapper</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#contents" target="contentFrame" class="scala/swing/SequentialContainer/Wrapper">scala.swing.SequentialContainer.Wrapper.contents</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Container/Wrapper">scala.swing.Container.Wrapper</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#_contents" target="contentFrame" class="scala/swing/Container/Wrapper">scala.swing.Container.Wrapper._contents</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#initP" target="contentFrame" class="scala/swing/Component">scala.swing.Component.initP</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#listeners" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.listeners</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#reactions" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.reactions</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/GridPanel">scala.swing.GridPanel</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#rows" target="contentFrame" class="scala/swing/GridPanel">scala.swing.GridPanel.rows</a>, <a href="#rows_=" target="contentFrame" class="scala/swing/GridPanel">scala.swing.GridPanel.rows_=</a>, <a href="#columns" target="contentFrame" class="scala/swing/GridPanel">scala.swing.GridPanel.columns</a>, <a href="#columns_=" target="contentFrame" class="scala/swing/GridPanel">scala.swing.GridPanel.columns_=</a>, <a href="#vGap" target="contentFrame" class="scala/swing/GridPanel">scala.swing.GridPanel.vGap</a>, <a href="#vGap_=" target="contentFrame" class="scala/swing/GridPanel">scala.swing.GridPanel.vGap_=</a>, <a href="#hGap" target="contentFrame" class="scala/swing/GridPanel">scala.swing.GridPanel.hGap</a>, <a href="#hGap_=" target="contentFrame" class="scala/swing/GridPanel">scala.swing.GridPanel.hGap_=</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#xLayoutAlignment" target="contentFrame" class="scala/swing/Component">scala.swing.Component.xLayoutAlignment</a>, <a href="#xLayoutAlignment_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.xLayoutAlignment_=</a>, <a href="#yLayoutAlignment" target="contentFrame" class="scala/swing/Component">scala.swing.Component.yLayoutAlignment</a>, <a href="#yLayoutAlignment_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.yLayoutAlignment_=</a>, <a href="#border" target="contentFrame" class="scala/swing/Component">scala.swing.Component.border</a>, <a href="#border_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.border_=</a>, <a href="#opaque" target="contentFrame" class="scala/swing/Component">scala.swing.Component.opaque</a>, <a href="#opaque_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.opaque_=</a>, <a href="#enabled" target="contentFrame" class="scala/swing/Component">scala.swing.Component.enabled</a>, <a href="#enabled_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.enabled_=</a>, <a href="#tooltip" target="contentFrame" class="scala/swing/Component">scala.swing.Component.tooltip</a>, <a href="#tooltip_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.tooltip_=</a>, <a href="#inputVerifier" target="contentFrame" class="scala/swing/Component">scala.swing.Component.inputVerifier</a>, <a href="#inputVerifier_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.inputVerifier_=</a>, <a href="#revalidate" target="contentFrame" class="scala/swing/Component">scala.swing.Component.revalidate</a>, <a href="#requestFocus" target="contentFrame" class="scala/swing/Component">scala.swing.Component.requestFocus</a>, <a href="#paintComponent" target="contentFrame" class="scala/swing/Component">scala.swing.Component.paintComponent</a>, <a href="#paint" target="contentFrame" class="scala/swing/Component">scala.swing.Component.paint</a>, <a href="#toString" target="contentFrame" class="scala/swing/Component">scala.swing.Component.toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#subscribe" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.subscribe</a>, <a href="#unsubscribe" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.unsubscribe</a>, <a href="#publish" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.publish</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#listenTo" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.listenTo</a>, <a href="#deafTo" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.deafTo</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#self" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.self</a>, <a href="#foreground" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.foreground</a>, <a href="#foreground_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.foreground_=</a>, <a href="#background" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.background</a>, <a href="#background_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.background_=</a>, <a href="#minimumSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.minimumSize</a>, <a href="#minimumSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.minimumSize_=</a>, <a href="#maximumSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.maximumSize</a>, <a href="#maximumSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.maximumSize_=</a>, <a href="#preferredSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize</a>, <a href="#preferredSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize_=</a>, <a href="#preferredSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize_=</a>, <a href="#font" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.font</a>, <a href="#font_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.font_=</a>, <a href="#locationOnScreen" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.locationOnScreen</a>, <a href="#location" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.location</a>, <a href="#bounds" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.bounds</a>, <a href="#size" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size</a>, <a href="#size_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size_=</a>, <a href="#size_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size_=</a>, <a href="#locale" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.locale</a>, <a href="#toolkit" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.toolkit</a>, <a href="#cursor" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.cursor</a>, <a href="#cursor_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.cursor_=</a>, <a href="#visible" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.visible</a>, <a href="#visible_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.visible_=</a>, <a href="#showing" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.showing</a>, <a href="#repaint" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.repaint</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Proxy">scala.Proxy</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#hashCode" target="contentFrame" class="scala/Proxy">scala.Proxy.hashCode</a>, <a href="#equals" target="contentFrame" class="scala/Proxy">scala.Proxy.equals</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>ShapeInfoPanel</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">ShapeInfoPanel</span><span class="result"> extends <span class="extype" name="scala.swing.GridPanel">GridPanel</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="lblBody"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.swing.GridPanel">GridPanel</li><li class="in" name="scala.swing.SequentialContainer.Wrapper">Wrapper</li><li class="in" name="scala.swing.SequentialContainer">SequentialContainer</li><li class="in" name="scala.swing.Panel">Panel</li><li class="in" name="scala.swing.Container.Wrapper">Wrapper</li><li class="in" name="scala.swing.Container">Container</li><li class="in" name="scala.swing.Component">Component</li><li class="in" name="scala.swing.UIElement">UIElement</li><li class="in" name="scala.swing.LazyPublisher">LazyPublisher</li><li class="in" name="scala.swing.Publisher">Publisher</li><li class="in" name="scala.swing.Reactor">Reactor</li><li class="in" name="scala.Proxy">Proxy</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code></code>
-        <code>val</code>
-        <em>lblBody</em> : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="lblValBody"></a><dl>
-      <dt>
         
-        <code></code>
-        <code>val</code>
-        <em>lblValBody</em> : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="lblShape"></a><dl>
-      <dt>
         
-        <code></code>
-        <code>val</code>
-        <em>lblShape</em> : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="lblValShape"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="scala.swing.Component#Mouse">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">Mouse</span><span class="result">: <span class="extype" name="scala.swing.Component.mouse">mouse</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#background">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">background</span><span class="result">: <span class="extype" name="java.awt.Color">Color</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#background_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">background_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Color">Color</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#border">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">border</span><span class="result">: <span class="extype" name="javax.swing.border.Border">Border</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#border_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">border_=</span><span class="params">(<span name="b">b: <span class="extype" name="javax.swing.border.Border">Border</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#bounds">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">bounds</span><span class="result">: <span class="extype" name="java.awt.Rectangle">Rectangle</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.GridPanel#columns">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">columns</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.GridPanel#columns_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">columns_=</span><span class="params">(<span name="n">n: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.ShapeInfoPanel#components">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">components</span><span class="result">: <span class="extype" name="scala.collection.immutable.List">List</span>[<span class="extype" name="scala.swing.Label">Label</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.SequentialContainer.Wrapper#contents">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">contents</span><span class="result">: <span class="extype" name="scala.collection.mutable.Buffer">Buffer</span>[<span class="extype" name="scala.swing.Component">Component</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#cursor">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cursor</span><span class="result">: <span class="extype" name="java.awt.Cursor">Cursor</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#cursor_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cursor_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Cursor">Cursor</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#deafTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">deafTo</span><span class="params">(<span name="ps">ps: <span class="extype" name="scala.swing.Publisher">Publisher</span>*</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#displayable">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">displayable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#enabled">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">enabled</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#enabled_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">enabled_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="that">that: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.Component#focusable">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">focusable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#focusable_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">focusable_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#font">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">font</span><span class="result">: <span class="extype" name="java.awt.Font">Font</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#font_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">font_=</span><span class="params">(<span name="f">f: <span class="extype" name="java.awt.Font">Font</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#foreground">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">foreground</span><span class="result">: <span class="extype" name="java.awt.Color">Color</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#foreground_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">foreground_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Color">Color</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.GridPanel#hGap">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hGap</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.GridPanel#hGap_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hGap_=</span><span class="params">(<span name="n">n: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#hasFocus">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hasFocus</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.UIElement#ignoreRepaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">ignoreRepaint</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#ignoreRepaint_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">ignoreRepaint_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#initP">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">initP</span><span class="result">: <span class="extype" name="javax.swing.JComponent">JComponent</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#inputVerifier">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">inputVerifier</span><span class="result">: (ShapeInfoPanel.this.type) ⇒ <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#inputVerifier_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">inputVerifier_=</span><span class="params">(<span name="v">v: (ShapeInfoPanel.this.type) ⇒ <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.ShapeInfoPanel#lblBody">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">lblBody</span><span class="result">: <span class="extype" name="scala.swing.Label">Label</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.ShapeInfoPanel#lblShape">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">lblShape</span><span class="result">: <span class="extype" name="scala.swing.Label">Label</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.ShapeInfoPanel#lblValBody">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">lblValBody</span><span class="result">: <span class="extype" name="scala.swing.Label">Label</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.ShapeInfoPanel#lblValShape">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">lblValShape</span><span class="result">: <span class="extype" name="scala.swing.Label">Label</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#listenTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">listenTo</span><span class="params">(<span name="ps">ps: <span class="extype" name="scala.swing.Publisher">Publisher</span>*</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#locale">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">locale</span><span class="result">: <span class="extype" name="java.util.Locale">Locale</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#location">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">location</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#locationOnScreen">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">locationOnScreen</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#maximumSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximumSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#maximumSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximumSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#minimumSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">minimumSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#minimumSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">minimumSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#onFirstSubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">onFirstSubscribe</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#onLastUnsubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">onLastUnsubscribe</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#opaque">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">opaque</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#opaque_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">opaque_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#paint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">paint</span><span class="params">(<span name="g">g: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.GridPanel#peer">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">peer</span><span class="result">: <span class="extype" name="javax.swing.JPanel">JPanel</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize_=</span><span class="params">(<span name="xy">xy: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Publisher#publish">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">publish</span><span class="params">(<span name="e">e: <span class="extype" name="scala.swing.event.Event">Event</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#reactions">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">reactions</span><span class="result">: <span class="extype" name="scala.swing.Reactions">Reactions</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#repaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">repaint</span><span class="params">(<span name="rect">rect: <span class="extype" name="java.awt.Rectangle">Rectangle</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#repaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">repaint</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#requestFocus">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">requestFocus</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#requestFocusInWindow">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">requestFocusInWindow</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#revalidate">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">revalidate</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.GridPanel#rows">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">rows</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.GridPanel#rows_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">rows_=</span><span class="params">(<span name="n">n: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#self">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">self</span><span class="result">: <span class="extype" name="java.awt.Component">Component</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#showing">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">showing</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size_=</span><span class="params">(<span name="xy">xy: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size_=</span><span class="params">(<span name="dim">dim: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LazyPublisher#subscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">subscribe</span><span class="params">(<span name="listener">listener: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.swing.event.Event">Event</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Component ⇐ Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.UIElement#toolkit">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toolkit</span><span class="result">: <span class="extype" name="java.awt.Toolkit">Toolkit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#tooltip">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">tooltip</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#tooltip_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">tooltip_=</span><span class="params">(<span name="t">t: <span class="extype" name="java.lang.String">String</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LazyPublisher#unsubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">unsubscribe</span><span class="params">(<span name="listener">listener: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.swing.event.Event">Event</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.GridPanel#vGap">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">vGap</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.GridPanel#vGap_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">vGap_=</span><span class="params">(<span name="n">n: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#visible">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">visible</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#visible_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">visible_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#xLayoutAlignment">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">xLayoutAlignment</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#xLayoutAlignment_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">xLayoutAlignment_=</span><span class="params">(<span name="x">x: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#yLayoutAlignment">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">yLayoutAlignment</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#yLayoutAlignment_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">yLayoutAlignment_=</span><span class="params">(<span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>val</code>
-        <em>lblValShape</em> : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="components"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.gui.ShapeInfoPanel#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">ShapeInfoPanel</span><span class="params">(<span name="container">container: <a href="Container.html" class="extype" name="graphyx.gui.Container">Container</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.GridPanel#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">ShapeInfoPanel</span><span class="params">(<span name="rows0">rows0: <span class="extype" name="scala.Int">Int</span></span>, <span name="cols0">cols0: <span class="extype" name="scala.Int">Int</span></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Panel#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">ShapeInfoPanel</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>val</code>
-        <em>components</em> : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>]
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/gui/WorldPanel.html b/doc/graphyx/gui/WorldPanel.html
index e9a346e..1bac637 100644
--- a/doc/graphyx/gui/WorldPanel.html
+++ b/doc/graphyx/gui/WorldPanel.html
@@ -1,698 +1,910 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class WorldPanel in graphyx.gui</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.gui.WorldPanel</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/gui$package.html" target="_self">graphyx.gui</a>
-        <br></br>
-        <span class="entity">class  WorldPanel</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/gui/WorldPanel"><code>graphyx/gui/WorldPanel.scala</code></a>]
-      </div><hr></hr>
-      <a name="WorldPanel"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>class</code>
-        <em>WorldPanel</em>(<em>container</em> : <a href="../../graphyx/gui/Container.html" target="_self">Container</a>)
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/swing/BoxPanel">scala.swing.BoxPanel</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">gui</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#drawAABBs" target="_self">drawAABBs</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#drawBodies" target="_self">drawBodies</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#drawCollisions" target="_self">drawCollisions</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#drawJoints" target="_self">drawJoints</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#drawPairs" target="_self">drawPairs</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#drawShapes" target="_self">drawShapes</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#endPoint" target="_self">endPoint</a></em>
-         : <a href="" target="contentFrame" class="java/awt/Point">java.awt.Point</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#grabbedBody" target="_self">grabbedBody</a></em>
-         : <a href="" target="contentFrame" class="scala/Option">scala.Option</a>[<a href="../../graphyx/gui/GrabbedBody.html" target="_self">GrabbedBody</a>]
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#lblBody" target="_self">lblBody</a></em>
-         : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#mousePressed" target="_self">mousePressed</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#offset" target="_self">offset</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#popup" target="_self">popup</a></em>
-         : <a href="../../graphyx/gui/BodyPopup.html" target="_self">BodyPopup</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#ppm" target="_self">ppm</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#prevPos" target="_self">prevPos</a></em>
-         : <a href="" target="contentFrame" class="scala/collection/mutable/Map">scala.collection.mutable.Map</a>[<a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>, <a href="" target="contentFrame" class="scala/collection/mutable/Queue">scala.collection.mutable.Queue</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]]
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#scale" target="_self">scale</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#startPoint" target="_self">startPoint</a></em>
-         : <a href="" target="contentFrame" class="java/awt/Point">java.awt.Point</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#trace" target="_self">trace</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/BoxPanel">scala.swing.BoxPanel</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#peer" target="contentFrame" class="scala/swing/BoxPanel">scala.swing.BoxPanel.peer</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/SequentialContainer/Wrapper">scala.swing.SequentialContainer.Wrapper</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#contents" target="contentFrame" class="scala/swing/SequentialContainer/Wrapper">scala.swing.SequentialContainer.Wrapper.contents</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Container/Wrapper">scala.swing.Container.Wrapper</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#_contents" target="contentFrame" class="scala/swing/Container/Wrapper">scala.swing.Container.Wrapper._contents</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#initP" target="contentFrame" class="scala/swing/Component">scala.swing.Component.initP</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#listeners" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.listeners</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#reactions" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.reactions</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#drawAxes%28java.awt.Graphics%29" target="_self">drawAxes</a></em>
-        (<em>g</em> : <a href="" target="contentFrame" class="java/awt/Graphics">java.awt.Graphics</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#drawParts%28Iterable%5Bgraphyx.graphics.Drawable%5D%2Cjava.awt.Graphics%29" target="_self">drawParts</a></em>
-        (<em>parts</em> : <a href="" target="contentFrame" class="scala/Iterable">scala.Iterable</a>[<a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>], <em>g</em> : <a href="" target="contentFrame" class="java/awt/Graphics">java.awt.Graphics</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#getBody%28sims.geometry.Vector2D%29" target="_self">getBody</a></em>
-        (<em>p</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="" target="contentFrame" class="scala/Option">scala.Option</a>[<a href="../../sims/dynamics/Body.html" target="_self">Body</a>]
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#grab%28sims.dynamics.Body%2Csims.geometry.Vector2D%29" target="_self">grab</a></em>
-        (<em>b</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>, <em>p</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#paintComponent%28java.awt.Graphics%29" target="_self">paintComponent</a></em>
-        (<em>g</em> : <a href="" target="contentFrame" class="java/awt/Graphics">java.awt.Graphics</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>implicit def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#point2Vector%28java.awt.Point%29" target="_self">point2Vector</a></em>
-        (<em>p</em> : <a href="" target="contentFrame" class="java/awt/Point">java.awt.Point</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#release%28%29" target="_self">release</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#scene" target="_self">scene</a></em>
-         : <a href="../../graphyx/graphics/Scene.html" target="_self">Scene</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#trace%28Iterable%5Bgraphyx.graphics.GraphicalShape%5D%2Cjava.awt.Graphics%29" target="_self">trace</a></em>
-        (<em>shapes</em> : <a href="" target="contentFrame" class="scala/Iterable">scala.Iterable</a>[<a href="../../graphyx/graphics/GraphicalShape.html" target="_self">GraphicalShape</a>], <em>g</em> : <a href="" target="contentFrame" class="java/awt/Graphics">java.awt.Graphics</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/gui/WorldPanel.html#update%28%29" target="_self">update</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Component">scala.swing.Component</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#xLayoutAlignment" target="contentFrame" class="scala/swing/Component">scala.swing.Component.xLayoutAlignment</a>, <a href="#xLayoutAlignment_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.xLayoutAlignment_=</a>, <a href="#yLayoutAlignment" target="contentFrame" class="scala/swing/Component">scala.swing.Component.yLayoutAlignment</a>, <a href="#yLayoutAlignment_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.yLayoutAlignment_=</a>, <a href="#border" target="contentFrame" class="scala/swing/Component">scala.swing.Component.border</a>, <a href="#border_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.border_=</a>, <a href="#opaque" target="contentFrame" class="scala/swing/Component">scala.swing.Component.opaque</a>, <a href="#opaque_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.opaque_=</a>, <a href="#enabled" target="contentFrame" class="scala/swing/Component">scala.swing.Component.enabled</a>, <a href="#enabled_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.enabled_=</a>, <a href="#tooltip" target="contentFrame" class="scala/swing/Component">scala.swing.Component.tooltip</a>, <a href="#tooltip_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.tooltip_=</a>, <a href="#inputVerifier" target="contentFrame" class="scala/swing/Component">scala.swing.Component.inputVerifier</a>, <a href="#inputVerifier_=" target="contentFrame" class="scala/swing/Component">scala.swing.Component.inputVerifier_=</a>, <a href="#revalidate" target="contentFrame" class="scala/swing/Component">scala.swing.Component.revalidate</a>, <a href="#requestFocus" target="contentFrame" class="scala/swing/Component">scala.swing.Component.requestFocus</a>, <a href="#paint" target="contentFrame" class="scala/swing/Component">scala.swing.Component.paint</a>, <a href="#toString" target="contentFrame" class="scala/swing/Component">scala.swing.Component.toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#subscribe" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.subscribe</a>, <a href="#unsubscribe" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.unsubscribe</a>, <a href="#publish" target="contentFrame" class="scala/swing/Publisher">scala.swing.Publisher.publish</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#listenTo" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.listenTo</a>, <a href="#deafTo" target="contentFrame" class="scala/swing/Reactor">scala.swing.Reactor.deafTo</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#self" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.self</a>, <a href="#foreground" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.foreground</a>, <a href="#foreground_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.foreground_=</a>, <a href="#background" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.background</a>, <a href="#background_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.background_=</a>, <a href="#minimumSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.minimumSize</a>, <a href="#minimumSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.minimumSize_=</a>, <a href="#maximumSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.maximumSize</a>, <a href="#maximumSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.maximumSize_=</a>, <a href="#preferredSize" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize</a>, <a href="#preferredSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize_=</a>, <a href="#preferredSize_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.preferredSize_=</a>, <a href="#font" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.font</a>, <a href="#font_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.font_=</a>, <a href="#locationOnScreen" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.locationOnScreen</a>, <a href="#location" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.location</a>, <a href="#bounds" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.bounds</a>, <a href="#size" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size</a>, <a href="#size_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size_=</a>, <a href="#size_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.size_=</a>, <a href="#locale" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.locale</a>, <a href="#toolkit" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.toolkit</a>, <a href="#cursor" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.cursor</a>, <a href="#cursor_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.cursor_=</a>, <a href="#visible" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.visible</a>, <a href="#visible_=" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.visible_=</a>, <a href="#showing" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.showing</a>, <a href="#repaint" target="contentFrame" class="scala/swing/UIElement">scala.swing.UIElement.repaint</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Proxy">scala.Proxy</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#hashCode" target="contentFrame" class="scala/Proxy">scala.Proxy.hashCode</a>, <a href="#equals" target="contentFrame" class="scala/Proxy">scala.Proxy.equals</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>WorldPanel</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">WorldPanel</span><span class="result"> extends <span class="extype" name="scala.swing.BoxPanel">BoxPanel</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="lblBody"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>lblBody</em> : <a href="" target="contentFrame" class="scala/swing/Label">scala.swing.Label</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="popup"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>popup</em> : <a href="../../graphyx/gui/BodyPopup.html" target="_self">BodyPopup</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="ppm"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>ppm</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="scale"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>scale</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="offset"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>offset</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="drawBodies"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>drawBodies</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="drawShapes"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>drawShapes</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="drawJoints"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>drawJoints</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="drawAABBs"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>drawAABBs</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="drawPairs"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>drawPairs</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="drawCollisions"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>drawCollisions</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="trace"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>trace</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="prevPos"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>prevPos</em> : <a href="" target="contentFrame" class="scala/collection/mutable/Map">scala.collection.mutable.Map</a>[<a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>, <a href="" target="contentFrame" class="scala/collection/mutable/Queue">scala.collection.mutable.Queue</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]]
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="mousePressed"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>mousePressed</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="startPoint"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>startPoint</em> : <a href="" target="contentFrame" class="java/awt/Point">java.awt.Point</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="endPoint"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>endPoint</em> : <a href="" target="contentFrame" class="java/awt/Point">java.awt.Point</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="grabbedBody"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>grabbedBody</em> : <a href="" target="contentFrame" class="scala/Option">scala.Option</a>[<a href="../../graphyx/gui/GrabbedBody.html" target="_self">GrabbedBody</a>]
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="point2Vector%28java.awt.Point%29"></a><dl>
-      <dt>
-        
-        <code>implicit</code>
-        <code>def</code>
-        <em>point2Vector</em>(<em>p</em> : <a href="" target="contentFrame" class="java/awt/Point">java.awt.Point</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="scene"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>scene</em> : <a href="../../graphyx/graphics/Scene.html" target="_self">Scene</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="update%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>update</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="paintComponent%28java.awt.Graphics%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>paintComponent</em>(<em>g</em> : <a href="" target="contentFrame" class="java/awt/Graphics">java.awt.Graphics</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="drawAxes%28java.awt.Graphics%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>drawAxes</em>(<em>g</em> : <a href="" target="contentFrame" class="java/awt/Graphics">java.awt.Graphics</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="drawParts%28Iterable%5Bgraphyx.graphics.Drawable%5D%2Cjava.awt.Graphics%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>drawParts</em>(<em>parts</em> : <a href="" target="contentFrame" class="scala/Iterable">scala.Iterable</a>[<a href="../../graphyx/graphics/Drawable.html" target="_self">Drawable</a>], <em>g</em> : <a href="" target="contentFrame" class="java/awt/Graphics">java.awt.Graphics</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="trace%28Iterable%5Bgraphyx.graphics.GraphicalShape%5D%2Cjava.awt.Graphics%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>trace</em>(<em>shapes</em> : <a href="" target="contentFrame" class="scala/Iterable">scala.Iterable</a>[<a href="../../graphyx/graphics/GraphicalShape.html" target="_self">GraphicalShape</a>], <em>g</em> : <a href="" target="contentFrame" class="java/awt/Graphics">java.awt.Graphics</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="getBody%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>getBody</em>(<em>p</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="" target="contentFrame" class="scala/Option">scala.Option</a>[<a href="../../sims/dynamics/Body.html" target="_self">Body</a>]
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="grab%28sims.dynamics.Body%2Csims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>grab</em>(<em>b</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>, <em>p</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="release%28%29"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.swing.BoxPanel">BoxPanel</li><li class="in" name="scala.swing.SequentialContainer.Wrapper">Wrapper</li><li class="in" name="scala.swing.SequentialContainer">SequentialContainer</li><li class="in" name="scala.swing.Panel">Panel</li><li class="in" name="scala.swing.Container.Wrapper">Wrapper</li><li class="in" name="scala.swing.Container">Container</li><li class="in" name="scala.swing.Component">Component</li><li class="in" name="scala.swing.UIElement">UIElement</li><li class="in" name="scala.swing.LazyPublisher">LazyPublisher</li><li class="in" name="scala.swing.Publisher">Publisher</li><li class="in" name="scala.swing.Reactor">Reactor</li><li class="in" name="scala.Proxy">Proxy</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="scala.swing.Component#Mouse">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">Mouse</span><span class="result">: <span class="extype" name="scala.swing.Component.mouse">mouse</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#background">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">background</span><span class="result">: <span class="extype" name="java.awt.Color">Color</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#background_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">background_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Color">Color</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#border">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">border</span><span class="result">: <span class="extype" name="javax.swing.border.Border">Border</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#border_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">border_=</span><span class="params">(<span name="b">b: <span class="extype" name="javax.swing.border.Border">Border</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#bounds">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">bounds</span><span class="result">: <span class="extype" name="java.awt.Rectangle">Rectangle</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.SequentialContainer.Wrapper#contents">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">contents</span><span class="result">: <span class="extype" name="scala.collection.mutable.Buffer">Buffer</span>[<span class="extype" name="scala.swing.Component">Component</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#cursor">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cursor</span><span class="result">: <span class="extype" name="java.awt.Cursor">Cursor</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#cursor_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cursor_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Cursor">Cursor</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#deafTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">deafTo</span><span class="params">(<span name="ps">ps: <span class="extype" name="scala.swing.Publisher">Publisher</span>*</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#displayable">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">displayable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#drawAABBs">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">drawAABBs</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#drawAxes">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawAxes</span><span class="params">(<span name="g">g: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#drawBodies">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">drawBodies</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#drawCollisions">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">drawCollisions</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#drawJoints">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">drawJoints</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#drawPairs">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">drawPairs</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#drawParts">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">drawParts</span><span class="params">(<span name="parts">parts: <span class="extype" name="scala.collection.Iterable">Iterable</span>[<a href="../graphics/Drawable.html" class="extype" name="graphyx.graphics.Drawable">Drawable</a>]</span>, <span name="g">g: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#drawShapes">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">drawShapes</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#enabled">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">enabled</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#enabled_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">enabled_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#endPoint">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">endPoint</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="that">that: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.Component#focusable">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">focusable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#focusable_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">focusable_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#font">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">font</span><span class="result">: <span class="extype" name="java.awt.Font">Font</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#font_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">font_=</span><span class="params">(<span name="f">f: <span class="extype" name="java.awt.Font">Font</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#foreground">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">foreground</span><span class="result">: <span class="extype" name="java.awt.Color">Color</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#foreground_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">foreground_=</span><span class="params">(<span name="c">c: <span class="extype" name="java.awt.Color">Color</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#getBody">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">getBody</span><span class="params">(<span name="p">p: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Option">Option</span>[<a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#grab">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">grab</span><span class="params">(<span name="b">b: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="p">p: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#grabbedBody">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">grabbedBody</span><span class="result">: <span class="extype" name="scala.Option">Option</span>[<a href="GrabbedBody.html" class="extype" name="graphyx.gui.GrabbedBody">GrabbedBody</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#hasFocus">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hasFocus</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Proxy#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.UIElement#ignoreRepaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">ignoreRepaint</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#ignoreRepaint_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">ignoreRepaint_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#initP">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">initP</span><span class="result">: <span class="extype" name="javax.swing.JComponent">JComponent</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#inputVerifier">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">inputVerifier</span><span class="result">: (WorldPanel.this.type) ⇒ <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#inputVerifier_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">inputVerifier_=</span><span class="params">(<span name="v">v: (WorldPanel.this.type) ⇒ <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#lblBody">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">lblBody</span><span class="result">: <span class="extype" name="scala.swing.Label">Label</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#listenTo">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">listenTo</span><span class="params">(<span name="ps">ps: <span class="extype" name="scala.swing.Publisher">Publisher</span>*</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#locale">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">locale</span><span class="result">: <span class="extype" name="java.util.Locale">Locale</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#location">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">location</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#locationOnScreen">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">locationOnScreen</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#maximumSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximumSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#maximumSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">maximumSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#minimumSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">minimumSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#minimumSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">minimumSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#mousePressed">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">mousePressed</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#offset">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">offset</span><span class="result">: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#onFirstSubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">onFirstSubscribe</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#onLastUnsubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">onLastUnsubscribe</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#opaque">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">opaque</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#opaque_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">opaque_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#paint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">paint</span><span class="params">(<span name="g">g: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#paintComponent">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">paintComponent</span><span class="params">(<span name="g">g: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.BoxPanel#peer">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">peer</span><span class="result">: <span class="extype" name="javax.swing.JPanel">JPanel</span> with <span class="extype" name="scala.swing.Component.SuperMixin">SuperMixin</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#point2Vector">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">point2Vector</span><span class="params">(<span name="p">p: <span class="extype" name="java.awt.Point">Point</span></span>)</span><span class="result">: <a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#popup">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">popup</span><span class="result">: <a href="BodyPopup.html" class="extype" name="graphyx.gui.BodyPopup">BodyPopup</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#ppm">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">ppm</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize_=</span><span class="params">(<span name="xy">xy: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#preferredSize_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">preferredSize_=</span><span class="params">(<span name="x">x: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#prevPos">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">prevPos</span><span class="result">: <span class="extype" name="scala.collection.mutable.Map">Map</span>[<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.collection.mutable.Queue">Queue</span>[<a href="../../sims/geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Publisher#publish">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">publish</span><span class="params">(<span name="e">e: <span class="extype" name="scala.swing.event.Event">Event</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Reactor#reactions">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">reactions</span><span class="result">: <span class="extype" name="scala.swing.Reactions">Reactions</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#release">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">release</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#repaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">repaint</span><span class="params">(<span name="rect">rect: <span class="extype" name="java.awt.Rectangle">Rectangle</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#repaint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">repaint</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#requestFocus">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">requestFocus</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#requestFocusInWindow">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">requestFocusInWindow</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#revalidate">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">revalidate</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#scale">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">scale</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#scene">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">scene</span><span class="result">: <a href="../graphics/Scene.html" class="extype" name="graphyx.graphics.Scene">Scene</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#self">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">self</span><span class="result">: <span class="extype" name="java.awt.Component">Component</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#showing">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">showing</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size</span><span class="result">: <span class="extype" name="java.awt.Dimension">Dimension</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size_=</span><span class="params">(<span name="xy">xy: (<span class="extype" name="scala.Int">Int</span>, <span class="extype" name="scala.Int">Int</span>)</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#size_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">size_=</span><span class="params">(<span name="dim">dim: <span class="extype" name="java.awt.Dimension">Dimension</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#startPoint">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">startPoint</span><span class="result">: <span class="extype" name="java.awt.Point">Point</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LazyPublisher#subscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">subscribe</span><span class="params">(<span name="listener">listener: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.swing.event.Event">Event</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Component ⇐ Proxy ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.swing.UIElement#toolkit">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toolkit</span><span class="result">: <span class="extype" name="java.awt.Toolkit">Toolkit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#tooltip">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">tooltip</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#tooltip_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">tooltip_=</span><span class="params">(<span name="t">t: <span class="extype" name="java.lang.String">String</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#trace">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">trace</span><span class="params">(<span name="shapes">shapes: <span class="extype" name="scala.collection.Iterable">Iterable</span>[<a href="../graphics/GraphicalShape.html" class="extype" name="graphyx.graphics.GraphicalShape">GraphicalShape</a>]</span>, <span name="g">g: <span class="extype" name="java.awt.Graphics2D">Graphics2D</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#trace">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">trace</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.LazyPublisher#unsubscribe">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">unsubscribe</span><span class="params">(<span name="listener">listener: <span class="extype" name="scala.PartialFunction">PartialFunction</span>[<span class="extype" name="scala.swing.event.Event">Event</span>, <span class="extype" name="scala.Unit">Unit</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.gui.WorldPanel#update">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">update</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#visible">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">visible</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.UIElement#visible_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">visible_=</span><span class="params">(<span name="b">b: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#xLayoutAlignment">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">xLayoutAlignment</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#xLayoutAlignment_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">xLayoutAlignment_=</span><span class="params">(<span name="x">x: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#yLayoutAlignment">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">yLayoutAlignment</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Component#yLayoutAlignment_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">yLayoutAlignment_=</span><span class="params">(<span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.gui.WorldPanel#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">WorldPanel</span><span class="params">(<span name="container">container: <a href="Container.html" class="extype" name="graphyx.gui.Container">Container</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.BoxPanel#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">WorldPanel</span><span class="params">(<span name="orientation">orientation: <span class="extype" name="scala.Enumeration.Value">Value</span></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.swing.Panel#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">WorldPanel</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>release</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/gui/package.html b/doc/graphyx/gui/package.html
new file mode 100644
index 0000000..7ce1c92
--- /dev/null
+++ b/doc/graphyx/gui/package.html
@@ -0,0 +1,185 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.gui</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a></p>
+
+      <div id="definition">
+        <img src="../../lib/package_big.png" />
+        <h1>gui</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">gui</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        
+        
+        <div class="members" id="types">
+              <h3>Type Members</h3>
+              <ol><li name="graphyx.gui.AboutHelpFrame">
+      <h4 class="signature"><a href="AboutHelpFrame.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">AboutHelpFrame</span><span class="result"> extends Frame</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.gui.BodyPopup">
+      <h4 class="signature"><a href="BodyPopup.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">BodyPopup</span><span class="result"> extends PopupMenu</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.gui.Container">
+      <h4 class="signature"><a href="Container.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Container</span><span class="result"> extends AnyRef</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.gui.ControlPanel">
+      <h4 class="signature"><a href="ControlPanel.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">ControlPanel</span><span class="result"> extends BoxPanel</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.gui.GrabbedBody">
+      <h4 class="signature"><a href="GrabbedBody.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GrabbedBody</span><span class="result"> extends AnyRef</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.gui.GravityPanel">
+      <h4 class="signature"><a href="GravityPanel.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GravityPanel</span><span class="result"> extends GridBagPanel</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.gui.InfoPanel">
+      <h4 class="signature"><a href="InfoPanel.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">InfoPanel</span><span class="result"> extends BoxPanel</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.gui.MainFrame">
+      <h4 class="signature"><a href="MainFrame.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">MainFrame</span><span class="result"> extends Frame</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.gui.MainPanel">
+      <h4 class="signature"><a href="MainPanel.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">MainPanel</span><span class="result"> extends GridBagPanel</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.gui.MenuHelp">
+      <h4 class="signature"><a href="MenuHelp.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">MenuHelp</span><span class="result"> extends Menu</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.gui.MenuPanel">
+      <h4 class="signature"><a href="MenuPanel.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">MenuPanel</span><span class="result"> extends BoxPanel</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.gui.OptionsPanel">
+      <h4 class="signature"><a href="OptionsPanel.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">OptionsPanel</span><span class="result"> extends GridPanel</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.gui.PopupMenu">
+      <h4 class="signature"><a href="PopupMenu.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">PopupMenu</span><span class="result"> extends Component</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.gui.ShapeInfoPanel">
+      <h4 class="signature"><a href="ShapeInfoPanel.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">ShapeInfoPanel</span><span class="result"> extends GridPanel</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.gui.WorldPanel">
+      <h4 class="signature"><a href="WorldPanel.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">WorldPanel</span><span class="result"> extends BoxPanel</span>
+      </span>
+      </a></h4>
+      
+    </li></ol>
+            </div>
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.gui.AboutHelpFrame">
+      <h4 class="signature"><a href="AboutHelpFrame$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">AboutHelpFrame</span><span class="result"> extends AnyRef</span>
+      </span>
+      </a></h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/package.html b/doc/graphyx/package.html
new file mode 100644
index 0000000..286d1fe
--- /dev/null
+++ b/doc/graphyx/package.html
@@ -0,0 +1,94 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      
+
+      <div id="definition">
+        <img src="../lib/package_big.png" />
+        <h1>graphyx</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">graphyx</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.Graphyx">
+      <h4 class="signature"><a href="Graphyx$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Graphyx</span><span class="result"> extends AnyRef</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.actors">
+      <h4 class="signature"><a href="actors/package.html">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">actors</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.graphics">
+      <h4 class="signature"><a href="graphics/package.html">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">graphics</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.gui">
+      <h4 class="signature"><a href="gui/package.html">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">gui</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.tests">
+      <h4 class="signature"><a href="tests/package.html">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">tests</span>
+      </span>
+      </a></h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests$content.html b/doc/graphyx/tests$content.html
deleted file mode 100644
index ff87015..0000000
--- a/doc/graphyx/tests$content.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>All classes and objects in graphyx.tests</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../script.js"></script>
-        </head>
-        <body onload="init()"><div class="page-title"><div>Simple Mechanics Simulator (SiMS) API</div></div><p><div>This document is the API specification for SiMS</div></p><table summary="" cellpadding="3" class="member">
-        <tr><td class="title" colspan="2">Class Summary</td></tr>
-        <tr>
-      <td class="modifiers" valign="top"> 
-        <code> trait</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/tests/Test.html" target="_self">Test</a></em>
-        <code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        
-      </td>
-    </tr>        
-        </table>
-<table summary="" cellpadding="3" class="member">
-        <tr><td class="title" colspan="2">Object Summary</td></tr>
-        <tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/tests/Atom$object.html" target="_self">Atom</a></em>
-        <code> extends </code><a href="../graphyx/tests/Test.html" target="_self">Test</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/tests/BallStack$object.html" target="_self">BallStack</a></em>
-        <code> extends </code><a href="../graphyx/tests/Test.html" target="_self">Test</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/tests/Carriage$object.html" target="_self">Carriage</a></em>
-        <code> extends </code><a href="../graphyx/tests/Test.html" target="_self">Test</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/tests/Chain$object.html" target="_self">Chain</a></em>
-        <code> extends </code><a href="../graphyx/tests/Test.html" target="_self">Test</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/tests/CompositeShape$object.html" target="_self">CompositeShape</a></em>
-        <code> extends </code><a href="../graphyx/tests/Test.html" target="_self">Test</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/tests/Cup$object.html" target="_self">Cup</a></em>
-        <code> extends </code><a href="../graphyx/tests/Test.html" target="_self">Test</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/tests/EmptyTest$object.html" target="_self">EmptyTest</a></em>
-        <code> extends </code><a href="../graphyx/tests/Test.html" target="_self">Test</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/tests/Friction$object.html" target="_self">Friction</a></em>
-        <code> extends </code><a href="../graphyx/tests/Test.html" target="_self">Test</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/tests/Friction2$object.html" target="_self">Friction2</a></em>
-        <code> extends </code><a href="../graphyx/tests/Test.html" target="_self">Test</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/tests/General1$object.html" target="_self">General1</a></em>
-        <code> extends </code><a href="../graphyx/tests/Test.html" target="_self">Test</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/tests/General2$object.html" target="_self">General2</a></em>
-        <code> extends </code><a href="../graphyx/tests/Test.html" target="_self">Test</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/tests/Joints1$object.html" target="_self">Joints1</a></em>
-        <code> extends </code><a href="../graphyx/tests/Test.html" target="_self">Test</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/tests/Joints2$object.html" target="_self">Joints2</a></em>
-        <code> extends </code><a href="../graphyx/tests/Test.html" target="_self">Test</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/tests/Net$object.html" target="_self">Net</a></em>
-        <code> extends </code><a href="../graphyx/tests/Test.html" target="_self">Test</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/tests/RagdollTest$object.html" target="_self">RagdollTest</a></em>
-        <code> extends </code><a href="../graphyx/tests/Test.html" target="_self">Test</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/tests/Restitution$object.html" target="_self">Restitution</a></em>
-        <code> extends </code><a href="../graphyx/tests/Test.html" target="_self">Test</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/tests/Spring$object.html" target="_self">Spring</a></em>
-        <code> extends </code><a href="../graphyx/tests/Test.html" target="_self">Test</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/tests/Stacking$object.html" target="_self">Stacking</a></em>
-        <code> extends </code><a href="../graphyx/tests/Test.html" target="_self">Test</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../graphyx/tests/Wave$object.html" target="_self">Wave</a></em>
-        <code> extends </code><a href="../graphyx/tests/Test.html" target="_self">Test</a>
-        
-        
-      </td>
-    </tr>        
-        </table></body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests$package.html b/doc/graphyx/tests$package.html
deleted file mode 100644
index 7e57107..0000000
--- a/doc/graphyx/tests$package.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>List of classes and objects in package graphyx.tests</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../script.js"></script>
-        </head>
-        <body onload="init()"><table summary="" class="navigation">
-          <tr><td class="navigation-links" valign="top">
-            <a href="../graphyx/tests$content.html" target="contentFrame">graphyx.tests</a>
-          </td></tr>
-        </table><div><div class="kinds" id="Classes">Classes</div><ul class="list">
-        <li id="Classes_C"><a href="../graphyx/tests/Carriage$object.Car.html" target="contentFrame">Carriage.Car</a></li>
-<li id="Classes_T"><a href="../graphyx/tests/Test.html" target="contentFrame">Test</a></li>
-        </ul>
-<div class="kinds" id="Objects">Objects</div><ul class="list">
-        <li id="Objects_A"><a href="../graphyx/tests/Atom$object.html" target="contentFrame">Atom</a></li>
-<li id="Objects_B"><a href="../graphyx/tests/BallStack$object.html" target="contentFrame">BallStack</a></li>
-<li id="Objects_C"><a href="../graphyx/tests/Carriage$object.html" target="contentFrame">Carriage</a></li>
-<li><a href="../graphyx/tests/Chain$object.html" target="contentFrame">Chain</a></li>
-<li><a href="../graphyx/tests/CompositeShape$object.html" target="contentFrame">CompositeShape</a></li>
-<li><a href="../graphyx/tests/Cup$object.html" target="contentFrame">Cup</a></li>
-<li id="Objects_E"><a href="../graphyx/tests/EmptyTest$object.html" target="contentFrame">EmptyTest</a></li>
-<li id="Objects_F"><a href="../graphyx/tests/Friction$object.html" target="contentFrame">Friction</a></li>
-<li><a href="../graphyx/tests/Friction2$object.html" target="contentFrame">Friction2</a></li>
-<li id="Objects_G"><a href="../graphyx/tests/General1$object.html" target="contentFrame">General1</a></li>
-<li><a href="../graphyx/tests/General2$object.html" target="contentFrame">General2</a></li>
-<li id="Objects_J"><a href="../graphyx/tests/Joints1$object.html" target="contentFrame">Joints1</a></li>
-<li><a href="../graphyx/tests/Joints2$object.html" target="contentFrame">Joints2</a></li>
-<li id="Objects_N"><a href="../graphyx/tests/Net$object.html" target="contentFrame">Net</a></li>
-<li id="Objects_R"><a href="../graphyx/tests/RagdollTest$object.html" target="contentFrame">RagdollTest</a></li>
-<li><a href="../graphyx/tests/Restitution$object.html" target="contentFrame">Restitution</a></li>
-<li id="Objects_S"><a href="../graphyx/tests/Spring$object.html" target="contentFrame">Spring</a></li>
-<li><a href="../graphyx/tests/Stacking$object.html" target="contentFrame">Stacking</a></li>
-<li id="Objects_W"><a href="../graphyx/tests/Wave$object.html" target="contentFrame">Wave</a></li>
-        </ul></div></body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Atom$.html b/doc/graphyx/tests/Atom$.html
new file mode 100644
index 0000000..f323c1f
--- /dev/null
+++ b/doc/graphyx/tests/Atom$.html
@@ -0,0 +1,212 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.tests.Atom</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">tests</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>Atom</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Atom</span><span class="result"> extends <a href="Test.html" class="extype" name="graphyx.tests.Test">Test</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.tests.Test">Test</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.tests.Atom#connections">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">connections</span><span class="result">: <span class="extype" name="scala.collection.immutable.List">List</span>[<a href="../../sims/dynamics/joints/SpringJoint.html" class="extype" name="sims.dynamics.joints.SpringJoint">SpringJoint</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Atom#electrons">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">electrons</span><span class="result">: <span class="extype" name="scala.collection.immutable.List">List</span>[<a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Test#enableEvent">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">enableEvent</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Atom#fireEvent">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fireEvent</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Atom#init">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">init</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Atom#nucleus">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">nucleus</span><span class="result">: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Atom#title">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">title</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Test#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Test.html">Test</a> ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Atom#world">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">world</span><span class="result">: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Atom$object.html b/doc/graphyx/tests/Atom$object.html
deleted file mode 100644
index 2db8db4..0000000
--- a/doc/graphyx/tests/Atom$object.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Atom in graphyx.tests</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/tests$package.html" target="_self">graphyx.tests</a>
-        <br></br>
-        <span class="entity">object  Atom</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/tests/Atom"><code>graphyx/tests/Atom.scala</code></a>]
-      </div><hr></hr>
-      <a name="Atom"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Atom</em>
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/tests/Test.html" target="_self">Test</a></dd>
-    </dl>
-      
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Atom$object.html#connections" target="_self">connections</a></em>
-         : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/dynamics/joints/SpringJoint.html" target="_self">SpringJoint</a>]
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Atom$object.html#electrons" target="_self">electrons</a></em>
-         : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/dynamics/Body.html" target="_self">Body</a>]
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Atom$object.html#nucleus" target="_self">nucleus</a></em>
-         : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Atom$object.html#title" target="_self">title</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Atom$object.html#world" target="_self">world</a></em>
-         : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Atom$object.html#fireEvent%28%29" target="_self">fireEvent</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Atom$object.html#init%28%29" target="_self">init</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/tests/Test.html" target="_self">Test</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/tests/Test.html#toString%28%29" target="_self">toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="title"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>title</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#title" target="_self">title</a>
-        </dd>
-      </dl><hr></hr>
-<a name="world"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>world</em> : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#world" target="_self">world</a>
-        </dd>
-      </dl><hr></hr>
-<a name="nucleus"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>nucleus</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="electrons"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>electrons</em> : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/dynamics/Body.html" target="_self">Body</a>]
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="connections"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>connections</em> : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/dynamics/joints/SpringJoint.html" target="_self">SpringJoint</a>]
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="init%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>init</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#init%28%29" target="_self">init</a>
-        </dd>
-      </dl><hr></hr>
-<a name="fireEvent%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>fireEvent</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#fireEvent%28%29" target="_self">fireEvent</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/BallStack$.html b/doc/graphyx/tests/BallStack$.html
new file mode 100644
index 0000000..52bda16
--- /dev/null
+++ b/doc/graphyx/tests/BallStack$.html
@@ -0,0 +1,188 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.tests.BallStack</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">tests</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>BallStack</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">BallStack</span><span class="result"> extends <a href="Test.html" class="extype" name="graphyx.tests.Test">Test</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.tests.Test">Test</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.tests.Test#enableEvent">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">enableEvent</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Test#fireEvent">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fireEvent</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.BallStack#init">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">init</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.BallStack#title">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">title</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Test#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Test.html">Test</a> ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.BallStack#world">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">world</span><span class="result">: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/BallStack$object.html b/doc/graphyx/tests/BallStack$object.html
deleted file mode 100644
index 092ce96..0000000
--- a/doc/graphyx/tests/BallStack$object.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object BallStack in graphyx.tests</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/tests$package.html" target="_self">graphyx.tests</a>
-        <br></br>
-        <span class="entity">object  BallStack</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/tests/BallStack"><code>graphyx/tests/BallStack.scala</code></a>]
-      </div><hr></hr>
-      <a name="BallStack"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>BallStack</em>
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/tests/Test.html" target="_self">Test</a></dd>
-    </dl>
-      
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/BallStack$object.html#title" target="_self">title</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/BallStack$object.html#world" target="_self">world</a></em>
-         : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/BallStack$object.html#init%28%29" target="_self">init</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/tests/Test.html" target="_self">Test</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/tests/Test.html#fireEvent%28%29" target="_self">fireEvent</a>, <a href="../../graphyx/tests/Test.html#toString%28%29" target="_self">toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="world"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>world</em> : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#world" target="_self">world</a>
-        </dd>
-      </dl><hr></hr>
-<a name="title"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>title</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#title" target="_self">title</a>
-        </dd>
-      </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="init%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>init</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#init%28%29" target="_self">init</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Cannon$.html b/doc/graphyx/tests/Cannon$.html
new file mode 100644
index 0000000..b6d461a
--- /dev/null
+++ b/doc/graphyx/tests/Cannon$.html
@@ -0,0 +1,196 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.tests.Cannon</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">tests</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>Cannon</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Cannon</span><span class="result"> extends <a href="Test.html" class="extype" name="graphyx.tests.Test">Test</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.tests.Test">Test</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.tests.Cannon#blastBomb">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">blastBomb</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Test#enableEvent">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">enableEvent</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Cannon#fireEvent">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fireEvent</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Cannon#init">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">init</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Cannon#title">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">title</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Test#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Test.html">Test</a> ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Cannon#world">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">world</span><span class="result">: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Carriage$$Car.html b/doc/graphyx/tests/Carriage$$Car.html
new file mode 100644
index 0000000..7634625
--- /dev/null
+++ b/doc/graphyx/tests/Carriage$$Car.html
@@ -0,0 +1,231 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.tests.Carriage.Car</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="type">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">tests</a>.<a href="Carriage$.html">Carriage</a></p>
+
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>Car</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Car</span><span class="result"> extends <a href="../../sims/prefabs/Prefab.html" class="extype" name="sims.prefabs.Prefab">Prefab</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="sims.prefabs.Prefab">Prefab</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.tests.Carriage.Car#bodies">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">bodies</span><span class="result">: <span class="extype" name="scala.collection.immutable.List">List</span>[<a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Carriage.Car#chassis">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">chassis</span><span class="result">: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Carriage.Car#joints">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">joints</span><span class="result">: <span class="extype" name="scala.collection.immutable.List">List</span>[<span class="extype" name="scala.Product">Product</span> with <a href="../../sims/dynamics/joints/Joint.html" class="extype" name="sims.dynamics.joints.Joint">Joint</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Carriage.Car#leftDamper">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">leftDamper</span><span class="result">: <a href="../../sims/dynamics/joints/SpringJoint.html" class="extype" name="sims.dynamics.joints.SpringJoint">SpringJoint</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Carriage.Car#leftStabelizer">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">leftStabelizer</span><span class="result">: <a href="../../sims/dynamics/joints/DistanceJoint.html" class="extype" name="sims.dynamics.joints.DistanceJoint">DistanceJoint</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Carriage.Car#leftWheel">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">leftWheel</span><span class="result">: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Carriage.Car#rightDamper">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">rightDamper</span><span class="result">: <a href="../../sims/dynamics/joints/SpringJoint.html" class="extype" name="sims.dynamics.joints.SpringJoint">SpringJoint</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Carriage.Car#rightStabelizer">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">rightStabelizer</span><span class="result">: <a href="../../sims/dynamics/joints/DistanceJoint.html" class="extype" name="sims.dynamics.joints.DistanceJoint">DistanceJoint</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Carriage.Car#rightWheel">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">rightWheel</span><span class="result">: <a href="../../sims/dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="graphyx.tests.Carriage.Car#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Car</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Carriage$.html b/doc/graphyx/tests/Carriage$.html
new file mode 100644
index 0000000..e2ef925
--- /dev/null
+++ b/doc/graphyx/tests/Carriage$.html
@@ -0,0 +1,199 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.tests.Carriage</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">tests</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>Carriage</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Carriage</span><span class="result"> extends <a href="Test.html" class="extype" name="graphyx.tests.Test">Test</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.tests.Test">Test</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        <div class="members" id="types">
+              <h3>Type Members</h3>
+              <ol><li name="graphyx.tests.Carriage.Car">
+      <h4 class="signature"><a href="Carriage$$Car.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Car</span><span class="result"> extends Prefab</span>
+      </span>
+      </a></h4>
+      
+    </li></ol>
+            </div>
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.tests.Test#enableEvent">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">enableEvent</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Test#fireEvent">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fireEvent</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Carriage#init">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">init</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Carriage#title">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">title</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Test#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Test.html">Test</a> ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Carriage#world">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">world</span><span class="result">: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Carriage$object.Car.html b/doc/graphyx/tests/Carriage$object.Car.html
deleted file mode 100644
index 79e3aa1..0000000
--- a/doc/graphyx/tests/Carriage$object.Car.html
+++ /dev/null
@@ -1,272 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>class Car in graphyx.tests.Carriage</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/tests/Carriage$object.html" target="_self">graphyx.tests.Carriage</a>
-        <br></br>
-        <span class="entity">class  Car</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/tests/Carriage"><code>graphyx/tests/Carriage.scala</code></a>]
-      </div><hr></hr>
-      <a name="Car"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>class</code>
-        <em>Car</em>
-      </dt>
-      <dd><code> extends </code><a href="../../sims/prefabs/Prefab.html" target="_self">Prefab</a></dd>
-    </dl>
-      
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Carriage$object.Car.html#bodies" target="_self">bodies</a></em>
-         : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/dynamics/Body.html" target="_self">Body</a>]
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Carriage$object.Car.html#chassis" target="_self">chassis</a></em>
-         : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Carriage$object.Car.html#joints" target="_self">joints</a></em>
-         : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/dynamics/joints/Joint.html" target="_self">Joint</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>]
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Carriage$object.Car.html#leftDamper" target="_self">leftDamper</a></em>
-         : <a href="../../sims/dynamics/joints/SpringJoint.html" target="_self">SpringJoint</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Carriage$object.Car.html#leftStabelizer" target="_self">leftStabelizer</a></em>
-         : <a href="../../sims/dynamics/joints/DistanceJoint.html" target="_self">DistanceJoint</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Carriage$object.Car.html#leftWheel" target="_self">leftWheel</a></em>
-         : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Carriage$object.Car.html#rightDamper" target="_self">rightDamper</a></em>
-         : <a href="../../sims/dynamics/joints/SpringJoint.html" target="_self">SpringJoint</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Carriage$object.Car.html#rightStabelizer" target="_self">rightStabelizer</a></em>
-         : <a href="../../sims/dynamics/joints/DistanceJoint.html" target="_self">DistanceJoint</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Carriage$object.Car.html#rightWheel" target="_self">rightWheel</a></em>
-         : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="chassis"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>chassis</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="rightWheel"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>rightWheel</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="leftWheel"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>leftWheel</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="bodies"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>val</code>
-        <em>bodies</em> : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/dynamics/Body.html" target="_self">Body</a>]
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/prefabs/Prefab.html" target="_self">Prefab</a>.<a href="../../sims/prefabs/Prefab.html#bodies" target="_self">bodies</a>
-        </dd>
-      </dl><hr></hr>
-<a name="rightStabelizer"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>rightStabelizer</em> : <a href="../../sims/dynamics/joints/DistanceJoint.html" target="_self">DistanceJoint</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="rightDamper"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>rightDamper</em> : <a href="../../sims/dynamics/joints/SpringJoint.html" target="_self">SpringJoint</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="leftStabelizer"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>leftStabelizer</em> : <a href="../../sims/dynamics/joints/DistanceJoint.html" target="_self">DistanceJoint</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="leftDamper"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>leftDamper</em> : <a href="../../sims/dynamics/joints/SpringJoint.html" target="_self">SpringJoint</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="joints"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>val</code>
-        <em>joints</em> : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/dynamics/joints/Joint.html" target="_self">Joint</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>]
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/prefabs/Prefab.html" target="_self">Prefab</a>.<a href="../../sims/prefabs/Prefab.html#joints" target="_self">joints</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Carriage$object.html b/doc/graphyx/tests/Carriage$object.html
deleted file mode 100644
index c21093a..0000000
--- a/doc/graphyx/tests/Carriage$object.html
+++ /dev/null
@@ -1,182 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Carriage in graphyx.tests</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/tests$package.html" target="_self">graphyx.tests</a>
-        <br></br>
-        <span class="entity">object  Carriage</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/tests/Carriage"><code>graphyx/tests/Carriage.scala</code></a>]
-      </div><hr></hr>
-      <a name="Carriage"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Carriage</em>
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/tests/Test.html" target="_self">Test</a></dd>
-    </dl>
-      
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Carriage$object.html#title" target="_self">title</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Carriage$object.html#world" target="_self">world</a></em>
-         : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Carriage$object.html#init%28%29" target="_self">init</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/tests/Test.html" target="_self">Test</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/tests/Test.html#fireEvent%28%29" target="_self">fireEvent</a>, <a href="../../graphyx/tests/Test.html#toString%28%29" target="_self">toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Class Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Carriage$object.Car.html" target="_self">Car</a></em>
-        <code> extends </code><a href="../../sims/prefabs/Prefab.html" target="_self">Prefab</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-
-      
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="title"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>title</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#title" target="_self">title</a>
-        </dd>
-      </dl><hr></hr>
-<a name="world"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>world</em> : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#world" target="_self">world</a>
-        </dd>
-      </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="init%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>init</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#init%28%29" target="_self">init</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Chain$.html b/doc/graphyx/tests/Chain$.html
new file mode 100644
index 0000000..de4242e
--- /dev/null
+++ b/doc/graphyx/tests/Chain$.html
@@ -0,0 +1,188 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.tests.Chain</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">tests</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>Chain</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Chain</span><span class="result"> extends <a href="Test.html" class="extype" name="graphyx.tests.Test">Test</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.tests.Test">Test</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.tests.Test#enableEvent">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">enableEvent</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Test#fireEvent">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fireEvent</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Chain#init">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">init</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Chain#title">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">title</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Test#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Test.html">Test</a> ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Chain#world">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">world</span><span class="result">: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Chain$object.html b/doc/graphyx/tests/Chain$object.html
deleted file mode 100644
index 0818b71..0000000
--- a/doc/graphyx/tests/Chain$object.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Chain in graphyx.tests</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/tests$package.html" target="_self">graphyx.tests</a>
-        <br></br>
-        <span class="entity">object  Chain</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/tests/Chain"><code>graphyx/tests/Chain.scala</code></a>]
-      </div><hr></hr>
-      <a name="Chain"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Chain</em>
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/tests/Test.html" target="_self">Test</a></dd>
-    </dl>
-      
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Chain$object.html#title" target="_self">title</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Chain$object.html#world" target="_self">world</a></em>
-         : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Chain$object.html#init%28%29" target="_self">init</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/tests/Test.html" target="_self">Test</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/tests/Test.html#fireEvent%28%29" target="_self">fireEvent</a>, <a href="../../graphyx/tests/Test.html#toString%28%29" target="_self">toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="title"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>val</code>
-        <em>title</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#title" target="_self">title</a>
-        </dd>
-      </dl><hr></hr>
-<a name="world"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>world</em> : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#world" target="_self">world</a>
-        </dd>
-      </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="init%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>init</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#init%28%29" target="_self">init</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/CompositeShape$.html b/doc/graphyx/tests/CompositeShape$.html
new file mode 100644
index 0000000..4d13172
--- /dev/null
+++ b/doc/graphyx/tests/CompositeShape$.html
@@ -0,0 +1,188 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.tests.CompositeShape</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">tests</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>CompositeShape</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">CompositeShape</span><span class="result"> extends <a href="Test.html" class="extype" name="graphyx.tests.Test">Test</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.tests.Test">Test</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.tests.Test#enableEvent">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">enableEvent</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Test#fireEvent">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fireEvent</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.CompositeShape#init">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">init</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.CompositeShape#title">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">title</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Test#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Test.html">Test</a> ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.CompositeShape#world">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">world</span><span class="result">: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/CompositeShape$object.html b/doc/graphyx/tests/CompositeShape$object.html
deleted file mode 100644
index 2eb9a85..0000000
--- a/doc/graphyx/tests/CompositeShape$object.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object CompositeShape in graphyx.tests</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/tests$package.html" target="_self">graphyx.tests</a>
-        <br></br>
-        <span class="entity">object  CompositeShape</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/tests/CompositeShape"><code>graphyx/tests/CompositeShape.scala</code></a>]
-      </div><hr></hr>
-      <a name="CompositeShape"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>CompositeShape</em>
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/tests/Test.html" target="_self">Test</a></dd>
-    </dl>
-      
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/CompositeShape$object.html#title" target="_self">title</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/CompositeShape$object.html#world" target="_self">world</a></em>
-         : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/CompositeShape$object.html#init%28%29" target="_self">init</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/tests/Test.html" target="_self">Test</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/tests/Test.html#fireEvent%28%29" target="_self">fireEvent</a>, <a href="../../graphyx/tests/Test.html#toString%28%29" target="_self">toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="title"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>title</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#title" target="_self">title</a>
-        </dd>
-      </dl><hr></hr>
-<a name="world"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>world</em> : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#world" target="_self">world</a>
-        </dd>
-      </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="init%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>init</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#init%28%29" target="_self">init</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Cup$.html b/doc/graphyx/tests/Cup$.html
new file mode 100644
index 0000000..d57d680
--- /dev/null
+++ b/doc/graphyx/tests/Cup$.html
@@ -0,0 +1,188 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.tests.Cup</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">tests</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>Cup</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Cup</span><span class="result"> extends <a href="Test.html" class="extype" name="graphyx.tests.Test">Test</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.tests.Test">Test</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.tests.Test#enableEvent">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">enableEvent</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Test#fireEvent">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fireEvent</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Cup#init">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">init</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Cup#title">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">title</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Test#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Test.html">Test</a> ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Cup#world">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">world</span><span class="result">: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Cup$object.html b/doc/graphyx/tests/Cup$object.html
deleted file mode 100644
index b3c46a8..0000000
--- a/doc/graphyx/tests/Cup$object.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Cup in graphyx.tests</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/tests$package.html" target="_self">graphyx.tests</a>
-        <br></br>
-        <span class="entity">object  Cup</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/tests/Cup"><code>graphyx/tests/Cup.scala</code></a>]
-      </div><hr></hr>
-      <a name="Cup"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Cup</em>
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/tests/Test.html" target="_self">Test</a></dd>
-    </dl>
-      
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Cup$object.html#title" target="_self">title</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Cup$object.html#world" target="_self">world</a></em>
-         : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Cup$object.html#init%28%29" target="_self">init</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/tests/Test.html" target="_self">Test</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/tests/Test.html#fireEvent%28%29" target="_self">fireEvent</a>, <a href="../../graphyx/tests/Test.html#toString%28%29" target="_self">toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="title"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>title</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#title" target="_self">title</a>
-        </dd>
-      </dl><hr></hr>
-<a name="world"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>world</em> : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#world" target="_self">world</a>
-        </dd>
-      </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="init%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>init</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#init%28%29" target="_self">init</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/EmptyTest$.html b/doc/graphyx/tests/EmptyTest$.html
new file mode 100644
index 0000000..8fbe011
--- /dev/null
+++ b/doc/graphyx/tests/EmptyTest$.html
@@ -0,0 +1,188 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.tests.EmptyTest</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">tests</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>EmptyTest</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">EmptyTest</span><span class="result"> extends <a href="Test.html" class="extype" name="graphyx.tests.Test">Test</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.tests.Test">Test</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.tests.Test#enableEvent">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">enableEvent</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Test#fireEvent">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fireEvent</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.EmptyTest#init">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">init</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.EmptyTest#title">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">title</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Test#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Test.html">Test</a> ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.EmptyTest#world">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">world</span><span class="result">: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/EmptyTest$object.html b/doc/graphyx/tests/EmptyTest$object.html
deleted file mode 100644
index ff540a7..0000000
--- a/doc/graphyx/tests/EmptyTest$object.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object EmptyTest in graphyx.tests</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/tests$package.html" target="_self">graphyx.tests</a>
-        <br></br>
-        <span class="entity">object  EmptyTest</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/tests/EmptyTest"><code>graphyx/tests/EmptyTest.scala</code></a>]
-      </div><hr></hr>
-      <a name="EmptyTest"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>EmptyTest</em>
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/tests/Test.html" target="_self">Test</a></dd>
-    </dl>
-      
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/EmptyTest$object.html#title" target="_self">title</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/EmptyTest$object.html#world" target="_self">world</a></em>
-         : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/EmptyTest$object.html#init%28%29" target="_self">init</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/tests/Test.html" target="_self">Test</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/tests/Test.html#fireEvent%28%29" target="_self">fireEvent</a>, <a href="../../graphyx/tests/Test.html#toString%28%29" target="_self">toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="title"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>val</code>
-        <em>title</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#title" target="_self">title</a>
-        </dd>
-      </dl><hr></hr>
-<a name="world"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>world</em> : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#world" target="_self">world</a>
-        </dd>
-      </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="init%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>init</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#init%28%29" target="_self">init</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Friction$.html b/doc/graphyx/tests/Friction$.html
new file mode 100644
index 0000000..0aa7032
--- /dev/null
+++ b/doc/graphyx/tests/Friction$.html
@@ -0,0 +1,212 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.tests.Friction</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">tests</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>Friction</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Friction</span><span class="result"> extends <a href="Test.html" class="extype" name="graphyx.tests.Test">Test</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.tests.Test">Test</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.tests.Test#enableEvent">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">enableEvent</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Friction#fireEvent">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fireEvent</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Friction#init">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">init</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Friction#r1">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">r1</span><span class="result">: <a href="../../sims/dynamics/joints/RevoluteJoint.html" class="extype" name="sims.dynamics.joints.RevoluteJoint">RevoluteJoint</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Friction#r2">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">r2</span><span class="result">: <a href="../../sims/dynamics/joints/RevoluteJoint.html" class="extype" name="sims.dynamics.joints.RevoluteJoint">RevoluteJoint</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Friction#r3">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">r3</span><span class="result">: <a href="../../sims/dynamics/joints/RevoluteJoint.html" class="extype" name="sims.dynamics.joints.RevoluteJoint">RevoluteJoint</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Friction#title">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">title</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Test#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Test.html">Test</a> ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Friction#world">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">world</span><span class="result">: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Friction$object.html b/doc/graphyx/tests/Friction$object.html
deleted file mode 100644
index 7b3b691..0000000
--- a/doc/graphyx/tests/Friction$object.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Friction in graphyx.tests</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/tests$package.html" target="_self">graphyx.tests</a>
-        <br></br>
-        <span class="entity">object  Friction</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/tests/Friction"><code>graphyx/tests/Friction.scala</code></a>]
-      </div><hr></hr>
-      <a name="Friction"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Friction</em>
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/tests/Test.html" target="_self">Test</a></dd>
-    </dl>
-      
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Friction$object.html#r1" target="_self">r1</a></em>
-         : <a href="../../sims/dynamics/joints/RevoluteJoint.html" target="_self">RevoluteJoint</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Friction$object.html#r2" target="_self">r2</a></em>
-         : <a href="../../sims/dynamics/joints/RevoluteJoint.html" target="_self">RevoluteJoint</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Friction$object.html#r3" target="_self">r3</a></em>
-         : <a href="../../sims/dynamics/joints/RevoluteJoint.html" target="_self">RevoluteJoint</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Friction$object.html#title" target="_self">title</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Friction$object.html#world" target="_self">world</a></em>
-         : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Friction$object.html#fireEvent%28%29" target="_self">fireEvent</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Friction$object.html#init%28%29" target="_self">init</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/tests/Test.html" target="_self">Test</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/tests/Test.html#toString%28%29" target="_self">toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="title"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>title</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#title" target="_self">title</a>
-        </dd>
-      </dl><hr></hr>
-<a name="world"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>world</em> : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#world" target="_self">world</a>
-        </dd>
-      </dl><hr></hr>
-<a name="r1"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>r1</em> : <a href="../../sims/dynamics/joints/RevoluteJoint.html" target="_self">RevoluteJoint</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="r2"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>r2</em> : <a href="../../sims/dynamics/joints/RevoluteJoint.html" target="_self">RevoluteJoint</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="r3"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>r3</em> : <a href="../../sims/dynamics/joints/RevoluteJoint.html" target="_self">RevoluteJoint</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="init%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>init</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#init%28%29" target="_self">init</a>
-        </dd>
-      </dl><hr></hr>
-<a name="fireEvent%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>fireEvent</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#fireEvent%28%29" target="_self">fireEvent</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Friction2$.html b/doc/graphyx/tests/Friction2$.html
new file mode 100644
index 0000000..1a16968
--- /dev/null
+++ b/doc/graphyx/tests/Friction2$.html
@@ -0,0 +1,188 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.tests.Friction2</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">tests</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>Friction2</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Friction2</span><span class="result"> extends <a href="Test.html" class="extype" name="graphyx.tests.Test">Test</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.tests.Test">Test</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.tests.Test#enableEvent">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">enableEvent</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Test#fireEvent">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fireEvent</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Friction2#init">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">init</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Friction2#title">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">title</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Test#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Test.html">Test</a> ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Friction2#world">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">world</span><span class="result">: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a> {...}</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Friction2$object.html b/doc/graphyx/tests/Friction2$object.html
deleted file mode 100644
index 427e527..0000000
--- a/doc/graphyx/tests/Friction2$object.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Friction2 in graphyx.tests</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/tests$package.html" target="_self">graphyx.tests</a>
-        <br></br>
-        <span class="entity">object  Friction2</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/tests/Friction2"><code>graphyx/tests/Friction2.scala</code></a>]
-      </div><hr></hr>
-      <a name="Friction2"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Friction2</em>
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/tests/Test.html" target="_self">Test</a></dd>
-    </dl>
-      
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Friction2$object.html#title" target="_self">title</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Friction2$object.html#world" target="_self">world</a></em>
-         : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Friction2$object.html#init%28%29" target="_self">init</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/tests/Test.html" target="_self">Test</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/tests/Test.html#fireEvent%28%29" target="_self">fireEvent</a>, <a href="../../graphyx/tests/Test.html#toString%28%29" target="_self">toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="title"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>title</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#title" target="_self">title</a>
-        </dd>
-      </dl><hr></hr>
-<a name="world"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>world</em> : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#world" target="_self">world</a>
-        </dd>
-      </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="init%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>init</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#init%28%29" target="_self">init</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/General1$.html b/doc/graphyx/tests/General1$.html
new file mode 100644
index 0000000..d27d4f6
--- /dev/null
+++ b/doc/graphyx/tests/General1$.html
@@ -0,0 +1,196 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.tests.General1</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">tests</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>General1</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">General1</span><span class="result"> extends <a href="Test.html" class="extype" name="graphyx.tests.Test">Test</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.tests.Test">Test</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.tests.General1#blastBomb">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">blastBomb</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Test#enableEvent">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">enableEvent</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.General1#fireEvent">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fireEvent</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.General1#init">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">init</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.General1#title">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">title</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Test#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Test.html">Test</a> ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.General1#world">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">world</span><span class="result">: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/General1$object.html b/doc/graphyx/tests/General1$object.html
deleted file mode 100644
index 2484144..0000000
--- a/doc/graphyx/tests/General1$object.html
+++ /dev/null
@@ -1,216 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object General1 in graphyx.tests</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/tests$package.html" target="_self">graphyx.tests</a>
-        <br></br>
-        <span class="entity">object  General1</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/tests/General1"><code>graphyx/tests/General1.scala</code></a>]
-      </div><hr></hr>
-      <a name="General1"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>General1</em>
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/tests/Test.html" target="_self">Test</a></dd>
-    </dl>
-      
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/General1$object.html#title" target="_self">title</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/General1$object.html#world" target="_self">world</a></em>
-         : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/General1$object.html#blastBomb%28%29" target="_self">blastBomb</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/General1$object.html#fireEvent%28%29" target="_self">fireEvent</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/General1$object.html#init%28%29" target="_self">init</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/tests/Test.html" target="_self">Test</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/tests/Test.html#toString%28%29" target="_self">toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="title"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>val</code>
-        <em>title</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#title" target="_self">title</a>
-        </dd>
-      </dl><hr></hr>
-<a name="world"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>world</em> : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#world" target="_self">world</a>
-        </dd>
-      </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="init%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>init</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#init%28%29" target="_self">init</a>
-        </dd>
-      </dl><hr></hr>
-<a name="fireEvent%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>fireEvent</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#fireEvent%28%29" target="_self">fireEvent</a>
-        </dd>
-      </dl><hr></hr>
-<a name="blastBomb%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>blastBomb</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/General2$.html b/doc/graphyx/tests/General2$.html
new file mode 100644
index 0000000..a0f17cf
--- /dev/null
+++ b/doc/graphyx/tests/General2$.html
@@ -0,0 +1,188 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.tests.General2</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">tests</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>General2</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">General2</span><span class="result"> extends <a href="Test.html" class="extype" name="graphyx.tests.Test">Test</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.tests.Test">Test</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.tests.Test#enableEvent">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">enableEvent</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Test#fireEvent">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fireEvent</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.General2#init">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">init</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.General2#title">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">title</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Test#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Test.html">Test</a> ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.General2#world">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">world</span><span class="result">: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/General2$object.html b/doc/graphyx/tests/General2$object.html
deleted file mode 100644
index 099672b..0000000
--- a/doc/graphyx/tests/General2$object.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object General2 in graphyx.tests</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/tests$package.html" target="_self">graphyx.tests</a>
-        <br></br>
-        <span class="entity">object  General2</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/tests/General2"><code>graphyx/tests/General2.scala</code></a>]
-      </div><hr></hr>
-      <a name="General2"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>General2</em>
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/tests/Test.html" target="_self">Test</a></dd>
-    </dl>
-      
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/General2$object.html#title" target="_self">title</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/General2$object.html#world" target="_self">world</a></em>
-         : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/General2$object.html#init%28%29" target="_self">init</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/tests/Test.html" target="_self">Test</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/tests/Test.html#fireEvent%28%29" target="_self">fireEvent</a>, <a href="../../graphyx/tests/Test.html#toString%28%29" target="_self">toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="title"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>title</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#title" target="_self">title</a>
-        </dd>
-      </dl><hr></hr>
-<a name="world"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>world</em> : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#world" target="_self">world</a>
-        </dd>
-      </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="init%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>init</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#init%28%29" target="_self">init</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Joints1$.html b/doc/graphyx/tests/Joints1$.html
new file mode 100644
index 0000000..18fa2e6
--- /dev/null
+++ b/doc/graphyx/tests/Joints1$.html
@@ -0,0 +1,188 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.tests.Joints1</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">tests</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>Joints1</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Joints1</span><span class="result"> extends <a href="Test.html" class="extype" name="graphyx.tests.Test">Test</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.tests.Test">Test</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.tests.Test#enableEvent">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">enableEvent</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Test#fireEvent">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fireEvent</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Joints1#init">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">init</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Joints1#title">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">title</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Test#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Test.html">Test</a> ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Joints1#world">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">world</span><span class="result">: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Joints1$object.html b/doc/graphyx/tests/Joints1$object.html
deleted file mode 100644
index 808acb0..0000000
--- a/doc/graphyx/tests/Joints1$object.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Joints1 in graphyx.tests</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/tests$package.html" target="_self">graphyx.tests</a>
-        <br></br>
-        <span class="entity">object  Joints1</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/tests/Joints1"><code>graphyx/tests/Joints1.scala</code></a>]
-      </div><hr></hr>
-      <a name="Joints1"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Joints1</em>
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/tests/Test.html" target="_self">Test</a></dd>
-    </dl>
-      
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Joints1$object.html#title" target="_self">title</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Joints1$object.html#world" target="_self">world</a></em>
-         : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Joints1$object.html#init%28%29" target="_self">init</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/tests/Test.html" target="_self">Test</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/tests/Test.html#fireEvent%28%29" target="_self">fireEvent</a>, <a href="../../graphyx/tests/Test.html#toString%28%29" target="_self">toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="title"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>val</code>
-        <em>title</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#title" target="_self">title</a>
-        </dd>
-      </dl><hr></hr>
-<a name="world"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>world</em> : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#world" target="_self">world</a>
-        </dd>
-      </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="init%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>init</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#init%28%29" target="_self">init</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Joints2$.html b/doc/graphyx/tests/Joints2$.html
new file mode 100644
index 0000000..e44750b
--- /dev/null
+++ b/doc/graphyx/tests/Joints2$.html
@@ -0,0 +1,188 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.tests.Joints2</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">tests</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>Joints2</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Joints2</span><span class="result"> extends <a href="Test.html" class="extype" name="graphyx.tests.Test">Test</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.tests.Test">Test</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.tests.Test#enableEvent">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">enableEvent</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Test#fireEvent">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fireEvent</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Joints2#init">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">init</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Joints2#title">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">title</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Test#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Test.html">Test</a> ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Joints2#world">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">world</span><span class="result">: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Joints2$object.html b/doc/graphyx/tests/Joints2$object.html
deleted file mode 100644
index b141a42..0000000
--- a/doc/graphyx/tests/Joints2$object.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Joints2 in graphyx.tests</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/tests$package.html" target="_self">graphyx.tests</a>
-        <br></br>
-        <span class="entity">object  Joints2</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/tests/Joints2"><code>graphyx/tests/Joints2.scala</code></a>]
-      </div><hr></hr>
-      <a name="Joints2"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Joints2</em>
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/tests/Test.html" target="_self">Test</a></dd>
-    </dl>
-      
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Joints2$object.html#title" target="_self">title</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Joints2$object.html#world" target="_self">world</a></em>
-         : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Joints2$object.html#init%28%29" target="_self">init</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/tests/Test.html" target="_self">Test</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/tests/Test.html#fireEvent%28%29" target="_self">fireEvent</a>, <a href="../../graphyx/tests/Test.html#toString%28%29" target="_self">toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="title"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>val</code>
-        <em>title</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#title" target="_self">title</a>
-        </dd>
-      </dl><hr></hr>
-<a name="world"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>world</em> : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#world" target="_self">world</a>
-        </dd>
-      </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="init%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>init</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#init%28%29" target="_self">init</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Net$.html b/doc/graphyx/tests/Net$.html
new file mode 100644
index 0000000..7e42b9b
--- /dev/null
+++ b/doc/graphyx/tests/Net$.html
@@ -0,0 +1,188 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.tests.Net</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">tests</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>Net</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Net</span><span class="result"> extends <a href="Test.html" class="extype" name="graphyx.tests.Test">Test</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.tests.Test">Test</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.tests.Test#enableEvent">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">enableEvent</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Test#fireEvent">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fireEvent</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Net#init">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">init</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Net#title">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">title</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Test#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Test.html">Test</a> ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Net#world">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">world</span><span class="result">: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Net$object.html b/doc/graphyx/tests/Net$object.html
deleted file mode 100644
index 3bf8f69..0000000
--- a/doc/graphyx/tests/Net$object.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Net in graphyx.tests</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/tests$package.html" target="_self">graphyx.tests</a>
-        <br></br>
-        <span class="entity">object  Net</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/tests/Net"><code>graphyx/tests/Net.scala</code></a>]
-      </div><hr></hr>
-      <a name="Net"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Net</em>
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/tests/Test.html" target="_self">Test</a></dd>
-    </dl>
-      
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Net$object.html#title" target="_self">title</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Net$object.html#world" target="_self">world</a></em>
-         : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Net$object.html#init%28%29" target="_self">init</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/tests/Test.html" target="_self">Test</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/tests/Test.html#fireEvent%28%29" target="_self">fireEvent</a>, <a href="../../graphyx/tests/Test.html#toString%28%29" target="_self">toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="title"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>title</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#title" target="_self">title</a>
-        </dd>
-      </dl><hr></hr>
-<a name="world"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>world</em> : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#world" target="_self">world</a>
-        </dd>
-      </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="init%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>init</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#init%28%29" target="_self">init</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/RagdollTest$.html b/doc/graphyx/tests/RagdollTest$.html
new file mode 100644
index 0000000..f348e4f
--- /dev/null
+++ b/doc/graphyx/tests/RagdollTest$.html
@@ -0,0 +1,188 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.tests.RagdollTest</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">tests</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>RagdollTest</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">RagdollTest</span><span class="result"> extends <a href="Test.html" class="extype" name="graphyx.tests.Test">Test</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.tests.Test">Test</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.tests.Test#enableEvent">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">enableEvent</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Test#fireEvent">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fireEvent</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.RagdollTest#init">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">init</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.RagdollTest#title">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">title</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Test#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Test.html">Test</a> ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.RagdollTest#world">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">world</span><span class="result">: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/RagdollTest$object.html b/doc/graphyx/tests/RagdollTest$object.html
deleted file mode 100644
index 6457166..0000000
--- a/doc/graphyx/tests/RagdollTest$object.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object RagdollTest in graphyx.tests</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/tests$package.html" target="_self">graphyx.tests</a>
-        <br></br>
-        <span class="entity">object  RagdollTest</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/tests/RagdollTest"><code>graphyx/tests/RagdollTest.scala</code></a>]
-      </div><hr></hr>
-      <a name="RagdollTest"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>RagdollTest</em>
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/tests/Test.html" target="_self">Test</a></dd>
-    </dl>
-      
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/RagdollTest$object.html#title" target="_self">title</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/RagdollTest$object.html#world" target="_self">world</a></em>
-         : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/RagdollTest$object.html#init%28%29" target="_self">init</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/tests/Test.html" target="_self">Test</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/tests/Test.html#fireEvent%28%29" target="_self">fireEvent</a>, <a href="../../graphyx/tests/Test.html#toString%28%29" target="_self">toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="title"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>title</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#title" target="_self">title</a>
-        </dd>
-      </dl><hr></hr>
-<a name="world"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>world</em> : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#world" target="_self">world</a>
-        </dd>
-      </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="init%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>init</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#init%28%29" target="_self">init</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Restitution$.html b/doc/graphyx/tests/Restitution$.html
new file mode 100644
index 0000000..881958f
--- /dev/null
+++ b/doc/graphyx/tests/Restitution$.html
@@ -0,0 +1,188 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.tests.Restitution</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">tests</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>Restitution</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Restitution</span><span class="result"> extends <a href="Test.html" class="extype" name="graphyx.tests.Test">Test</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.tests.Test">Test</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.tests.Test#enableEvent">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">enableEvent</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Test#fireEvent">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fireEvent</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Restitution#init">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">init</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Restitution#title">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">title</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Test#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Test.html">Test</a> ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Restitution#world">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">world</span><span class="result">: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Restitution$object.html b/doc/graphyx/tests/Restitution$object.html
deleted file mode 100644
index 29c62a6..0000000
--- a/doc/graphyx/tests/Restitution$object.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Restitution in graphyx.tests</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/tests$package.html" target="_self">graphyx.tests</a>
-        <br></br>
-        <span class="entity">object  Restitution</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/tests/Restitution"><code>graphyx/tests/Restitution.scala</code></a>]
-      </div><hr></hr>
-      <a name="Restitution"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Restitution</em>
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/tests/Test.html" target="_self">Test</a></dd>
-    </dl>
-      
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Restitution$object.html#title" target="_self">title</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Restitution$object.html#world" target="_self">world</a></em>
-         : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Restitution$object.html#init%28%29" target="_self">init</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/tests/Test.html" target="_self">Test</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/tests/Test.html#fireEvent%28%29" target="_self">fireEvent</a>, <a href="../../graphyx/tests/Test.html#toString%28%29" target="_self">toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="title"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>title</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#title" target="_self">title</a>
-        </dd>
-      </dl><hr></hr>
-<a name="world"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>world</em> : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#world" target="_self">world</a>
-        </dd>
-      </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="init%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>init</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#init%28%29" target="_self">init</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Spring$.html b/doc/graphyx/tests/Spring$.html
new file mode 100644
index 0000000..a9e823d
--- /dev/null
+++ b/doc/graphyx/tests/Spring$.html
@@ -0,0 +1,188 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.tests.Spring</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">tests</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>Spring</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Spring</span><span class="result"> extends <a href="Test.html" class="extype" name="graphyx.tests.Test">Test</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.tests.Test">Test</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.tests.Test#enableEvent">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">enableEvent</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Test#fireEvent">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fireEvent</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Spring#init">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">init</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Spring#title">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">title</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Test#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Test.html">Test</a> ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Spring#world">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">world</span><span class="result">: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Spring$object.html b/doc/graphyx/tests/Spring$object.html
deleted file mode 100644
index c9a3d6f..0000000
--- a/doc/graphyx/tests/Spring$object.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Spring in graphyx.tests</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/tests$package.html" target="_self">graphyx.tests</a>
-        <br></br>
-        <span class="entity">object  Spring</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/tests/Spring"><code>graphyx/tests/Spring.scala</code></a>]
-      </div><hr></hr>
-      <a name="Spring"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Spring</em>
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/tests/Test.html" target="_self">Test</a></dd>
-    </dl>
-      
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Spring$object.html#title" target="_self">title</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Spring$object.html#world" target="_self">world</a></em>
-         : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Spring$object.html#init%28%29" target="_self">init</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/tests/Test.html" target="_self">Test</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/tests/Test.html#fireEvent%28%29" target="_self">fireEvent</a>, <a href="../../graphyx/tests/Test.html#toString%28%29" target="_self">toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="title"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>title</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#title" target="_self">title</a>
-        </dd>
-      </dl><hr></hr>
-<a name="world"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>world</em> : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#world" target="_self">world</a>
-        </dd>
-      </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="init%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>init</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#init%28%29" target="_self">init</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Stacking$.html b/doc/graphyx/tests/Stacking$.html
new file mode 100644
index 0000000..6792f3b
--- /dev/null
+++ b/doc/graphyx/tests/Stacking$.html
@@ -0,0 +1,188 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.tests.Stacking</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">tests</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>Stacking</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Stacking</span><span class="result"> extends <a href="Test.html" class="extype" name="graphyx.tests.Test">Test</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.tests.Test">Test</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.tests.Test#enableEvent">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">enableEvent</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Test#fireEvent">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fireEvent</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Stacking#init">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">init</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Stacking#title">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">title</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Test#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Test.html">Test</a> ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Stacking#world">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">world</span><span class="result">: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Stacking$object.html b/doc/graphyx/tests/Stacking$object.html
deleted file mode 100644
index c84e2c0..0000000
--- a/doc/graphyx/tests/Stacking$object.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Stacking in graphyx.tests</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/tests$package.html" target="_self">graphyx.tests</a>
-        <br></br>
-        <span class="entity">object  Stacking</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/tests/Stacking"><code>graphyx/tests/Stacking.scala</code></a>]
-      </div><hr></hr>
-      <a name="Stacking"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Stacking</em>
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/tests/Test.html" target="_self">Test</a></dd>
-    </dl>
-      
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Stacking$object.html#title" target="_self">title</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Stacking$object.html#world" target="_self">world</a></em>
-         : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Stacking$object.html#init%28%29" target="_self">init</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/tests/Test.html" target="_self">Test</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/tests/Test.html#fireEvent%28%29" target="_self">fireEvent</a>, <a href="../../graphyx/tests/Test.html#toString%28%29" target="_self">toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="world"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>world</em> : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#world" target="_self">world</a>
-        </dd>
-      </dl><hr></hr>
-<a name="title"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>title</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#title" target="_self">title</a>
-        </dd>
-      </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="init%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>init</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#init%28%29" target="_self">init</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Test.html b/doc/graphyx/tests/Test.html
index 33cfb50..379e304 100644
--- a/doc/graphyx/tests/Test.html
+++ b/doc/graphyx/tests/Test.html
@@ -1,190 +1,188 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>trait Test in graphyx.tests</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for graphyx.tests.Test</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/tests$package.html" target="_self">graphyx.tests</a>
-        <br></br>
-        <span class="entity">trait  Test</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/tests/Test"><code>graphyx/tests/Test.scala</code></a>]
-      </div><hr></hr>
-      <a name="Test"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>trait</code>
-        <em>Test</em>
-      </dt>
-      <dd><code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a></dd>
-    </dl><dl>
-      <dt style="margin:10px 0 0 20px;"><b>Direct Known Subclasses:</b></dt>
-      <dd><a href="../../graphyx/tests/Atom$object.html" target="_self">Atom</a>, <a href="../../graphyx/tests/BallStack$object.html" target="_self">BallStack</a>, <a href="../../graphyx/tests/Carriage$object.html" target="_self">Carriage</a>, <a href="../../graphyx/tests/Chain$object.html" target="_self">Chain</a>, <a href="../../graphyx/tests/CompositeShape$object.html" target="_self">CompositeShape</a>, <a href="../../graphyx/tests/Cup$object.html" target="_self">Cup</a>, <a href="../../graphyx/tests/EmptyTest$object.html" target="_self">EmptyTest</a>, <a href="../../graphyx/tests/Friction$object.html" target="_self">Friction</a>, <a href="../../graphyx/tests/Friction2$object.html" target="_self">Friction2</a>, <a href="../../graphyx/tests/General1$object.html" target="_self">General1</a>, <a href="../../graphyx/tests/General2$object.html" target="_self">General2</a>, <a href="../../graphyx/tests/Joints1$object.html" target="_self">Joints1</a>, <a href="../../graphyx/tests/Joints2$object.html" target="_self">Joints2</a>, <a href="../../graphyx/tests/Net$object.html" target="_self">Net</a>, <a href="../../graphyx/tests/RagdollTest$object.html" target="_self">RagdollTest</a>, <a href="../../graphyx/tests/Restitution$object.html" target="_self">Restitution</a>, <a href="../../graphyx/tests/Spring$object.html" target="_self">Spring</a>, <a href="../../graphyx/tests/Stacking$object.html" target="_self">Stacking</a>, <a href="../../graphyx/tests/Wave$object.html" target="_self">Wave</a></dd>
-      </dl><hr></hr>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">tests</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Test.html#title" target="_self">title</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Test.html#world" target="_self">world</a></em>
-         : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Test.html#fireEvent%28%29" target="_self">fireEvent</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Test.html#init%28%29" target="_self">init</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Test.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/trait_big.png" />
+        <h1>Test</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">trait</span>
+      <span class="symbol">
+        <span class="name">Test</span><span class="result"> extends AnyRef</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="world"></a><dl>
-      <dt>
-        
-        <code>abstract</code>
-        <code>val</code>
-        <em>world</em> : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="title"></a><dl>
-      <dt>
-        
-        <code>abstract</code>
-        <code>val</code>
-        <em>title</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="init%28%29"></a><dl>
-      <dt>
+      
+      
+      
+      <div class="block">
+                known subclasses: <a href="Wave$.html">Wave</a>, <a href="Stacking$.html">Stacking</a>, <a href="Spring$.html">Spring</a>, <a href="Restitution$.html">Restitution</a>, <a href="RagdollTest$.html">RagdollTest</a>, <a href="Net$.html">Net</a>, <a href="Joints2$.html">Joints2</a>, <a href="Joints1$.html">Joints1</a>, <a href="General2$.html">General2</a>, <a href="General1$.html">General1</a>, <a href="Friction2$.html">Friction2</a>, <a href="Friction$.html">Friction</a>, <a href="EmptyTest$.html">EmptyTest</a>, <a href="Cup$.html">Cup</a>, <a href="CompositeShape$.html">CompositeShape</a>, <a href="Chain$.html">Chain</a>, <a href="Carriage$.html">Carriage</a>, <a href="Cannon$.html">Cannon</a>, <a href="BallStack$.html">BallStack</a>, <a href="Atom$.html">Atom</a>
+              </div>
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.tests.Test#enableEvent">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">enableEvent</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Test#fireEvent">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fireEvent</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Test#init">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">init</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Test#title">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">title</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Test#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="graphyx.tests.Test#world">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">world</span><span class="result">: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>abstract</code>
-        <code>def</code>
-        <em>init</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="fireEvent%28%29"></a><dl>
-      <dt>
         
-        <code></code>
-        <code>def</code>
-        <em>fireEvent</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Wave$.html b/doc/graphyx/tests/Wave$.html
new file mode 100644
index 0000000..4baac1f
--- /dev/null
+++ b/doc/graphyx/tests/Wave$.html
@@ -0,0 +1,188 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.tests.Wave</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a>.<a href="package.html">tests</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>Wave</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Wave</span><span class="result"> extends <a href="Test.html" class="extype" name="graphyx.tests.Test">Test</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="graphyx.tests.Test">Test</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.tests.Test#enableEvent">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">enableEvent</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Test#fireEvent">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fireEvent</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Wave#init">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">init</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Wave#title">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">title</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="graphyx.tests.Test#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Test.html">Test</a> ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="graphyx.tests.Wave#world">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">world</span><span class="result">: <a href="../../sims/dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/Wave$object.html b/doc/graphyx/tests/Wave$object.html
deleted file mode 100644
index 1b31387..0000000
--- a/doc/graphyx/tests/Wave$object.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Wave in graphyx.tests</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../graphyx/tests$package.html" target="_self">graphyx.tests</a>
-        <br></br>
-        <span class="entity">object  Wave</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="graphyx/tests/Wave"><code>graphyx/tests/Wave.scala</code></a>]
-      </div><hr></hr>
-      <a name="Wave"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Wave</em>
-      </dt>
-      <dd><code> extends </code><a href="../../graphyx/tests/Test.html" target="_self">Test</a></dd>
-    </dl>
-      
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Wave$object.html#title" target="_self">title</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Wave$object.html#world" target="_self">world</a></em>
-         : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../graphyx/tests/Wave$object.html#init%28%29" target="_self">init</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../graphyx/tests/Test.html" target="_self">Test</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../graphyx/tests/Test.html#fireEvent%28%29" target="_self">fireEvent</a>, <a href="../../graphyx/tests/Test.html#toString%28%29" target="_self">toString</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="title"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>title</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#title" target="_self">title</a>
-        </dd>
-      </dl><hr></hr>
-<a name="world"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>world</em> : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#world" target="_self">world</a>
-        </dd>
-      </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="init%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>init</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../graphyx/tests/Test.html" target="_self">Test</a>.<a href="../../graphyx/tests/Test.html#init%28%29" target="_self">init</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/graphyx/tests/package.html b/doc/graphyx/tests/package.html
new file mode 100644
index 0000000..2952bd7
--- /dev/null
+++ b/doc/graphyx/tests/package.html
@@ -0,0 +1,225 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for graphyx.tests</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">graphyx</a></p>
+
+      <div id="definition">
+        <img src="../../lib/package_big.png" />
+        <h1>tests</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">tests</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        
+        
+        <div class="members" id="types">
+              <h3>Type Members</h3>
+              <ol><li name="graphyx.tests.Test">
+      <h4 class="signature"><a href="Test.html">
+      <span class="kind">trait</span>
+      <span class="symbol">
+        <span class="name">Test</span><span class="result"> extends AnyRef</span>
+      </span>
+      </a></h4>
+      
+    </li></ol>
+            </div>
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="graphyx.tests.Atom">
+      <h4 class="signature"><a href="Atom$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Atom</span><span class="result"> extends Test</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.tests.BallStack">
+      <h4 class="signature"><a href="BallStack$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">BallStack</span><span class="result"> extends Test</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.tests.Cannon">
+      <h4 class="signature"><a href="Cannon$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Cannon</span><span class="result"> extends Test</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.tests.Carriage">
+      <h4 class="signature"><a href="Carriage$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Carriage</span><span class="result"> extends Test</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.tests.Chain">
+      <h4 class="signature"><a href="Chain$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Chain</span><span class="result"> extends Test</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.tests.CompositeShape">
+      <h4 class="signature"><a href="CompositeShape$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">CompositeShape</span><span class="result"> extends Test</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.tests.Cup">
+      <h4 class="signature"><a href="Cup$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Cup</span><span class="result"> extends Test</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.tests.EmptyTest">
+      <h4 class="signature"><a href="EmptyTest$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">EmptyTest</span><span class="result"> extends Test</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.tests.Friction">
+      <h4 class="signature"><a href="Friction$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Friction</span><span class="result"> extends Test</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.tests.Friction2">
+      <h4 class="signature"><a href="Friction2$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Friction2</span><span class="result"> extends Test</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.tests.General1">
+      <h4 class="signature"><a href="General1$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">General1</span><span class="result"> extends Test</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.tests.General2">
+      <h4 class="signature"><a href="General2$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">General2</span><span class="result"> extends Test</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.tests.Joints1">
+      <h4 class="signature"><a href="Joints1$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Joints1</span><span class="result"> extends Test</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.tests.Joints2">
+      <h4 class="signature"><a href="Joints2$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Joints2</span><span class="result"> extends Test</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.tests.Net">
+      <h4 class="signature"><a href="Net$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Net</span><span class="result"> extends Test</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.tests.RagdollTest">
+      <h4 class="signature"><a href="RagdollTest$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">RagdollTest</span><span class="result"> extends Test</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.tests.Restitution">
+      <h4 class="signature"><a href="Restitution$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Restitution</span><span class="result"> extends Test</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.tests.Spring">
+      <h4 class="signature"><a href="Spring$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Spring</span><span class="result"> extends Test</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.tests.Stacking">
+      <h4 class="signature"><a href="Stacking$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Stacking</span><span class="result"> extends Test</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="graphyx.tests.Wave">
+      <h4 class="signature"><a href="Wave$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Wave</span><span class="result"> extends Test</span>
+      </span>
+      </a></h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/index.html b/doc/index.html
index 33257d7..0a422e3 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -1,14 +1,396 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>SiMS</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script>
+        <head>
+          <title>Scaladoc: all classes and objects</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(lib/index.css) screen;
+		  </style>
+		  <script type="text/javascript" src="lib/index.js"></script>
+    
         </head>
-        <frameset cols="25%, 75%">
-    <frameset rows="50%, 28, 50%">
-    <frame src="modules.html" name="modulesFrame"></frame>
-    <frame src="nav-classes.html" name="navigationFrame"></frame>
-    <frame src="all-classes.html" name="classesFrame"></frame>
-    </frameset>
-    <frame src="root-content.html" name="contentFrame"></frame>
-    </frameset>
+        <body>
+      <div id="browser">
+        <input accesskey="/" type="text" id="quickflt" />
+        <div id="tpl">
+              
+              <ol class="templates"></ol>
+              <ol class="packages"> <li>
+              <h3><a href="graphyx/package.html" class="tplshow">graphyx</a></h3>
+              <ol class="templates"><li title="graphyx.Graphyx"><a href="graphyx/Graphyx$.html" class="tplshow">
+                      Graphyx
+                      <span class="object">(object)</span>
+                    </a></li></ol>
+              <ol class="packages"> <li>
+              <h3><a href="graphyx/actors/package.html" class="tplshow">graphyx.actors</a></h3>
+              <ol class="templates"><li title="graphyx.actors.Exit"><a href="graphyx/actors/Exit$.html" class="tplshow">
+                      Exit
+                      <span class="object">(object)</span>
+                    </a></li><li title="graphyx.actors.FireEvent"><a href="graphyx/actors/FireEvent$.html" class="tplshow">
+                      FireEvent
+                      <span class="object">(object)</span>
+                    </a></li><li title="graphyx.actors.GUIActor"><a href="graphyx/actors/GUIActor.html" class="tplshow">
+                      GUIActor
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.actors.PhysicsActor"><a href="graphyx/actors/PhysicsActor.html" class="tplshow">
+                      PhysicsActor
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.actors.SetWorld"><a href="graphyx/actors/SetWorld.html" class="tplshow">
+                      SetWorld
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.actors.Start"><a href="graphyx/actors/Start$.html" class="tplshow">
+                      Start
+                      <span class="object">(object)</span>
+                    </a></li><li title="graphyx.actors.Stop"><a href="graphyx/actors/Stop$.html" class="tplshow">
+                      Stop
+                      <span class="object">(object)</span>
+                    </a></li></ol>
+              <ol class="packages"> </ol>
+            </li><li>
+              <h3><a href="graphyx/graphics/package.html" class="tplshow">graphyx.graphics</a></h3>
+              <ol class="templates"><li title="graphyx.graphics.Drawable"><a href="graphyx/graphics/Drawable.html" class="tplshow">
+                      Drawable
+                      <span class="trait">(trait)</span>
+                    </a></li><li title="graphyx.graphics.GraphicalAABB"><a href="graphyx/graphics/GraphicalAABB.html" class="tplshow">
+                      GraphicalAABB
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.graphics.GraphicalBody"><a href="graphyx/graphics/GraphicalBody.html" class="tplshow">
+                      GraphicalBody
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.graphics.GraphicalCircle"><a href="graphyx/graphics/GraphicalCircle.html" class="tplshow">
+                      GraphicalCircle
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.graphics.GraphicalCollision"><a href="graphyx/graphics/GraphicalCollision.html" class="tplshow">
+                      GraphicalCollision
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.graphics.GraphicalDistanceJoint"><a href="graphyx/graphics/GraphicalDistanceJoint.html" class="tplshow">
+                      GraphicalDistanceJoint
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.graphics.GraphicalJoint"><a href="graphyx/graphics/GraphicalJoint.html" class="tplshow">
+                      GraphicalJoint
+                      <span class="trait">(trait)</span>
+                    </a></li><li title="graphyx.graphics.GraphicalObject"><a href="graphyx/graphics/GraphicalObject.html" class="tplshow">
+                      GraphicalObject
+                      <span class="trait">(trait)</span>
+                    </a></li><li title="graphyx.graphics.GraphicalPair"><a href="graphyx/graphics/GraphicalPair.html" class="tplshow">
+                      GraphicalPair
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.graphics.GraphicalRectangle"><a href="graphyx/graphics/GraphicalRectangle.html" class="tplshow">
+                      GraphicalRectangle
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.graphics.GraphicalRegularPolygon"><a href="graphyx/graphics/GraphicalRegularPolygon.html" class="tplshow">
+                      GraphicalRegularPolygon
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.graphics.GraphicalRevoluteJoint"><a href="graphyx/graphics/GraphicalRevoluteJoint.html" class="tplshow">
+                      GraphicalRevoluteJoint
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.graphics.GraphicalShape"><a href="graphyx/graphics/GraphicalShape.html" class="tplshow">
+                      GraphicalShape
+                      <span class="trait">(trait)</span>
+                    </a></li><li title="graphyx.graphics.GraphicalSpringJoint"><a href="graphyx/graphics/GraphicalSpringJoint.html" class="tplshow">
+                      GraphicalSpringJoint
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.graphics.GraphicalWorld"><a href="graphyx/graphics/GraphicalWorld.html" class="tplshow">
+                      GraphicalWorld
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.graphics.MonitorResult"><a href="graphyx/graphics/MonitorResult.html" class="tplshow">
+                      MonitorResult
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.graphics.Parser"><a href="graphyx/graphics/Parser$.html" class="tplshow">
+                      Parser
+                      <span class="object">(object)</span>
+                    </a></li><li title="graphyx.graphics.Scene"><a href="graphyx/graphics/Scene.html" class="tplshow">
+                      Scene
+                      <span class="class">(class)</span>
+                    </a></li></ol>
+              <ol class="packages"> </ol>
+            </li><li>
+              <h3><a href="graphyx/gui/package.html" class="tplshow">graphyx.gui</a></h3>
+              <ol class="templates"><li title="graphyx.gui.AboutHelpFrame"><a href="graphyx/gui/AboutHelpFrame.html" class="tplshow">
+                      AboutHelpFrame
+                      <span class="class">(class)</span>
+                    </a><a href="graphyx/gui/AboutHelpFrame$.html" class="tplshow">
+                      
+                      <span class="object">(object)</span>
+                    </a></li><li title="graphyx.gui.BodyPopup"><a href="graphyx/gui/BodyPopup.html" class="tplshow">
+                      BodyPopup
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.gui.Container"><a href="graphyx/gui/Container.html" class="tplshow">
+                      Container
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.gui.ControlPanel"><a href="graphyx/gui/ControlPanel.html" class="tplshow">
+                      ControlPanel
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.gui.GrabbedBody"><a href="graphyx/gui/GrabbedBody.html" class="tplshow">
+                      GrabbedBody
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.gui.GravityPanel"><a href="graphyx/gui/GravityPanel.html" class="tplshow">
+                      GravityPanel
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.gui.InfoPanel"><a href="graphyx/gui/InfoPanel.html" class="tplshow">
+                      InfoPanel
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.gui.MainFrame"><a href="graphyx/gui/MainFrame.html" class="tplshow">
+                      MainFrame
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.gui.MainPanel"><a href="graphyx/gui/MainPanel.html" class="tplshow">
+                      MainPanel
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.gui.MenuHelp"><a href="graphyx/gui/MenuHelp.html" class="tplshow">
+                      MenuHelp
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.gui.MenuPanel"><a href="graphyx/gui/MenuPanel.html" class="tplshow">
+                      MenuPanel
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.gui.OptionsPanel"><a href="graphyx/gui/OptionsPanel.html" class="tplshow">
+                      OptionsPanel
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.gui.PopupMenu"><a href="graphyx/gui/PopupMenu.html" class="tplshow">
+                      PopupMenu
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.gui.ShapeInfoPanel"><a href="graphyx/gui/ShapeInfoPanel.html" class="tplshow">
+                      ShapeInfoPanel
+                      <span class="class">(class)</span>
+                    </a></li><li title="graphyx.gui.WorldPanel"><a href="graphyx/gui/WorldPanel.html" class="tplshow">
+                      WorldPanel
+                      <span class="class">(class)</span>
+                    </a></li></ol>
+              <ol class="packages"> </ol>
+            </li><li>
+              <h3><a href="graphyx/tests/package.html" class="tplshow">graphyx.tests</a></h3>
+              <ol class="templates"><li title="graphyx.tests.Atom"><a href="graphyx/tests/Atom$.html" class="tplshow">
+                      Atom
+                      <span class="object">(object)</span>
+                    </a></li><li title="graphyx.tests.BallStack"><a href="graphyx/tests/BallStack$.html" class="tplshow">
+                      BallStack
+                      <span class="object">(object)</span>
+                    </a></li><li title="graphyx.tests.Cannon"><a href="graphyx/tests/Cannon$.html" class="tplshow">
+                      Cannon
+                      <span class="object">(object)</span>
+                    </a></li><li title="graphyx.tests.Carriage"><a href="graphyx/tests/Carriage$.html" class="tplshow">
+                      Carriage
+                      <span class="object">(object)</span>
+                    </a></li><li title="graphyx.tests.Chain"><a href="graphyx/tests/Chain$.html" class="tplshow">
+                      Chain
+                      <span class="object">(object)</span>
+                    </a></li><li title="graphyx.tests.CompositeShape"><a href="graphyx/tests/CompositeShape$.html" class="tplshow">
+                      CompositeShape
+                      <span class="object">(object)</span>
+                    </a></li><li title="graphyx.tests.Cup"><a href="graphyx/tests/Cup$.html" class="tplshow">
+                      Cup
+                      <span class="object">(object)</span>
+                    </a></li><li title="graphyx.tests.EmptyTest"><a href="graphyx/tests/EmptyTest$.html" class="tplshow">
+                      EmptyTest
+                      <span class="object">(object)</span>
+                    </a></li><li title="graphyx.tests.Friction"><a href="graphyx/tests/Friction$.html" class="tplshow">
+                      Friction
+                      <span class="object">(object)</span>
+                    </a></li><li title="graphyx.tests.Friction2"><a href="graphyx/tests/Friction2$.html" class="tplshow">
+                      Friction2
+                      <span class="object">(object)</span>
+                    </a></li><li title="graphyx.tests.General1"><a href="graphyx/tests/General1$.html" class="tplshow">
+                      General1
+                      <span class="object">(object)</span>
+                    </a></li><li title="graphyx.tests.General2"><a href="graphyx/tests/General2$.html" class="tplshow">
+                      General2
+                      <span class="object">(object)</span>
+                    </a></li><li title="graphyx.tests.Joints1"><a href="graphyx/tests/Joints1$.html" class="tplshow">
+                      Joints1
+                      <span class="object">(object)</span>
+                    </a></li><li title="graphyx.tests.Joints2"><a href="graphyx/tests/Joints2$.html" class="tplshow">
+                      Joints2
+                      <span class="object">(object)</span>
+                    </a></li><li title="graphyx.tests.Net"><a href="graphyx/tests/Net$.html" class="tplshow">
+                      Net
+                      <span class="object">(object)</span>
+                    </a></li><li title="graphyx.tests.RagdollTest"><a href="graphyx/tests/RagdollTest$.html" class="tplshow">
+                      RagdollTest
+                      <span class="object">(object)</span>
+                    </a></li><li title="graphyx.tests.Restitution"><a href="graphyx/tests/Restitution$.html" class="tplshow">
+                      Restitution
+                      <span class="object">(object)</span>
+                    </a></li><li title="graphyx.tests.Spring"><a href="graphyx/tests/Spring$.html" class="tplshow">
+                      Spring
+                      <span class="object">(object)</span>
+                    </a></li><li title="graphyx.tests.Stacking"><a href="graphyx/tests/Stacking$.html" class="tplshow">
+                      Stacking
+                      <span class="object">(object)</span>
+                    </a></li><li title="graphyx.tests.Test"><a href="graphyx/tests/Test.html" class="tplshow">
+                      Test
+                      <span class="trait">(trait)</span>
+                    </a></li><li title="graphyx.tests.Wave"><a href="graphyx/tests/Wave$.html" class="tplshow">
+                      Wave
+                      <span class="object">(object)</span>
+                    </a></li></ol>
+              <ol class="packages"> </ol>
+            </li></ol>
+            </li><li>
+              <h3><a href="sims/package.html" class="tplshow">sims</a></h3>
+              <ol class="templates"></ol>
+              <ol class="packages"> <li>
+              <h3><a href="sims/collision/package.html" class="tplshow">sims.collision</a></h3>
+              <ol class="templates"><li title="sims.collision.AABB"><a href="sims/collision/AABB.html" class="tplshow">
+                      AABB
+                      <span class="class">(class)</span>
+                    </a></li><li title="sims.collision.CircleCollision"><a href="sims/collision/CircleCollision.html" class="tplshow">
+                      CircleCollision
+                      <span class="class">(class)</span>
+                    </a></li><li title="sims.collision.Collision"><a href="sims/collision/Collision.html" class="tplshow">
+                      Collision
+                      <span class="class">(class)</span>
+                    </a><a href="sims/collision/Collision$.html" class="tplshow">
+                      
+                      <span class="object">(object)</span>
+                    </a></li><li title="sims.collision.Detector"><a href="sims/collision/Detector.html" class="tplshow">
+                      Detector
+                      <span class="class">(class)</span>
+                    </a></li><li title="sims.collision.GridDetector"><a href="sims/collision/GridDetector.html" class="tplshow">
+                      GridDetector
+                      <span class="class">(class)</span>
+                    </a></li><li title="sims.collision.Overlap"><a href="sims/collision/Overlap.html" class="tplshow">
+                      Overlap
+                      <span class="class">(class)</span>
+                    </a></li><li title="sims.collision.Pair"><a href="sims/collision/Pair.html" class="tplshow">
+                      Pair
+                      <span class="class">(class)</span>
+                    </a></li><li title="sims.collision.PolyCircleCollision"><a href="sims/collision/PolyCircleCollision.html" class="tplshow">
+                      PolyCircleCollision
+                      <span class="class">(class)</span>
+                    </a></li><li title="sims.collision.PolyCollision"><a href="sims/collision/PolyCollision.html" class="tplshow">
+                      PolyCollision
+                      <span class="class">(class)</span>
+                    </a></li></ol>
+              <ol class="packages"> </ol>
+            </li><li>
+              <h3><a href="sims/dynamics/package.html" class="tplshow">sims.dynamics</a></h3>
+              <ol class="templates"><li title="sims.dynamics.Body"><a href="sims/dynamics/Body.html" class="tplshow">
+                      Body
+                      <span class="class">(class)</span>
+                    </a><a href="sims/dynamics/Body$.html" class="tplshow">
+                      
+                      <span class="object">(object)</span>
+                    </a></li><li title="sims.dynamics.Circle"><a href="sims/dynamics/Circle.html" class="tplshow">
+                      Circle
+                      <span class="class">(class)</span>
+                    </a></li><li title="sims.dynamics.Constraint"><a href="sims/dynamics/Constraint.html" class="tplshow">
+                      Constraint
+                      <span class="trait">(trait)</span>
+                    </a></li><li title="sims.dynamics.Rectangle"><a href="sims/dynamics/Rectangle.html" class="tplshow">
+                      Rectangle
+                      <span class="class">(class)</span>
+                    </a></li><li title="sims.dynamics.RegularPolygon"><a href="sims/dynamics/RegularPolygon.html" class="tplshow">
+                      RegularPolygon
+                      <span class="class">(class)</span>
+                    </a></li><li title="sims.dynamics.Shape"><a href="sims/dynamics/Shape.html" class="tplshow">
+                      Shape
+                      <span class="class">(class)</span>
+                    </a><a href="sims/dynamics/Shape$.html" class="tplshow">
+                      
+                      <span class="object">(object)</span>
+                    </a></li><li title="sims.dynamics.World"><a href="sims/dynamics/World.html" class="tplshow">
+                      World
+                      <span class="class">(class)</span>
+                    </a></li></ol>
+              <ol class="packages"> <li>
+              <h3><a href="sims/dynamics/joints/package.html" class="tplshow">sims.dynamics.joints</a></h3>
+              <ol class="templates"><li title="sims.dynamics.joints.DistanceJoint"><a href="sims/dynamics/joints/DistanceJoint.html" class="tplshow">
+                      DistanceJoint
+                      <span class="class">(class)</span>
+                    </a></li><li title="sims.dynamics.joints.ForceJoint"><a href="sims/dynamics/joints/ForceJoint.html" class="tplshow">
+                      ForceJoint
+                      <span class="trait">(trait)</span>
+                    </a></li><li title="sims.dynamics.joints.Joint"><a href="sims/dynamics/joints/Joint.html" class="tplshow">
+                      Joint
+                      <span class="class">(class)</span>
+                    </a></li><li title="sims.dynamics.joints.RevoluteJoint"><a href="sims/dynamics/joints/RevoluteJoint.html" class="tplshow">
+                      RevoluteJoint
+                      <span class="class">(class)</span>
+                    </a></li><li title="sims.dynamics.joints.SpringJoint"><a href="sims/dynamics/joints/SpringJoint.html" class="tplshow">
+                      SpringJoint
+                      <span class="class">(class)</span>
+                    </a></li></ol>
+              <ol class="packages"> <li>
+              <h3><a href="sims/dynamics/joints/test/package.html" class="tplshow">sims.dynamics.joints.test</a></h3>
+              <ol class="templates"><li title="sims.dynamics.joints.test.PrismaticJoint"><a href="sims/dynamics/joints/test/PrismaticJoint.html" class="tplshow">
+                      PrismaticJoint
+                      <span class="class">(class)</span>
+                    </a></li><li title="sims.dynamics.joints.test.UnitCircleJoint"><a href="sims/dynamics/joints/test/UnitCircleJoint.html" class="tplshow">
+                      UnitCircleJoint
+                      <span class="class">(class)</span>
+                    </a></li></ol>
+              <ol class="packages"> </ol>
+            </li></ol>
+            </li></ol>
+            </li><li>
+              <h3><a href="sims/geometry/package.html" class="tplshow">sims.geometry</a></h3>
+              <ol class="templates"><li title="sims.geometry.ConvexPolygon"><a href="sims/geometry/ConvexPolygon.html" class="tplshow">
+                      ConvexPolygon
+                      <span class="trait">(trait)</span>
+                    </a></li><li title="sims.geometry.Projection"><a href="sims/geometry/Projection.html" class="tplshow">
+                      Projection
+                      <span class="class">(class)</span>
+                    </a></li><li title="sims.geometry.Ray"><a href="sims/geometry/Ray.html" class="tplshow">
+                      Ray
+                      <span class="class">(class)</span>
+                    </a></li><li title="sims.geometry.Segment"><a href="sims/geometry/Segment.html" class="tplshow">
+                      Segment
+                      <span class="class">(class)</span>
+                    </a></li><li title="sims.geometry.Vector2D"><a href="sims/geometry/Vector2D.html" class="tplshow">
+                      Vector2D
+                      <span class="class">(class)</span>
+                    </a><a href="sims/geometry/Vector2D$.html" class="tplshow">
+                      
+                      <span class="object">(object)</span>
+                    </a></li></ol>
+              <ol class="packages"> </ol>
+            </li><li>
+              <h3><a href="sims/math/package.html" class="tplshow">sims.math</a></h3>
+              <ol class="templates"><li title="sims.math.Matrix22"><a href="sims/math/Matrix22.html" class="tplshow">
+                      Matrix22
+                      <span class="class">(class)</span>
+                    </a><a href="sims/math/Matrix22$.html" class="tplshow">
+                      
+                      <span class="object">(object)</span>
+                    </a></li></ol>
+              <ol class="packages"> </ol>
+            </li><li>
+              <h3><a href="sims/prefabs/package.html" class="tplshow">sims.prefabs</a></h3>
+              <ol class="templates"><li title="sims.prefabs.Net"><a href="sims/prefabs/Net.html" class="tplshow">
+                      Net
+                      <span class="class">(class)</span>
+                    </a></li><li title="sims.prefabs.Prefab"><a href="sims/prefabs/Prefab.html" class="tplshow">
+                      Prefab
+                      <span class="trait">(trait)</span>
+                    </a></li><li title="sims.prefabs.Pylon"><a href="sims/prefabs/Pylon.html" class="tplshow">
+                      Pylon
+                      <span class="class">(class)</span>
+                    </a></li><li title="sims.prefabs.Ragdoll"><a href="sims/prefabs/Ragdoll.html" class="tplshow">
+                      Ragdoll
+                      <span class="class">(class)</span>
+                    </a></li></ol>
+              <ol class="packages"> </ol>
+            </li><li>
+              <h3><a href="sims/util/package.html" class="tplshow">sims.util</a></h3>
+              <ol class="templates"><li title="sims.util.Polar"><a href="sims/util/Polar.html" class="tplshow">
+                      Polar
+                      <span class="class">(class)</span>
+                    </a></li><li title="sims.util.Positioning"><a href="sims/util/Positioning$.html" class="tplshow">
+                      Positioning
+                      <span class="object">(object)</span>
+                    </a></li><li title="sims.util.RelativeVector"><a href="sims/util/RelativeVector.html" class="tplshow">
+                      RelativeVector
+                      <span class="class">(class)</span>
+                    </a></li></ol>
+              <ol class="packages"> </ol>
+            </li></ol>
+            </li></ol>
+            </div>
+      </div>
+		  <div id="content">
+		  	<iframe src="package.html"></iframe>
+		  </div>
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/lib/class.png b/doc/lib/class.png
new file mode 100644
index 0000000..c6e3841
Binary files /dev/null and b/doc/lib/class.png differ
diff --git a/doc/lib/class_big.png b/doc/lib/class_big.png
new file mode 100644
index 0000000..1969cff
Binary files /dev/null and b/doc/lib/class_big.png differ
diff --git a/doc/lib/index.css b/doc/lib/index.css
new file mode 100644
index 0000000..0b444ee
--- /dev/null
+++ b/doc/lib/index.css
@@ -0,0 +1,102 @@
+* {
+	color: inherit;
+	font-size: 10pt;
+	text-decoration: none;
+	font-family: sans-serif;
+	border-width: 0px;
+	padding: 0px;
+	margin: 0px;
+}
+
+a {
+	cursor: pointer;
+}
+
+a:hover {
+	text-decoration: underline;
+}
+
+h1 {
+	display: none;
+}
+
+#browser {
+	top: 0px;
+	left: 0px;
+	bottom: 0px;
+	width: 300px;
+	display: block;
+	position: fixed;
+}
+
+#quickflt {
+	display: block;
+	position: fixed;
+	height: 22px;
+	right: 0px;
+	left: 0px;
+	top: 0px;
+	position: absolute;
+	display: block;
+	font-weight: bold;
+	color: #993300;
+	padding: 5px;
+	background-color: white;
+}
+
+#tpl {
+	display: block;
+	position: fixed;
+	overflow: auto;
+	right: 0px;
+	left: 0px;
+	bottom: 0px;
+	top: 30px;
+	position: absolute;
+	display: block;
+}
+
+#tpl .packhide {
+	display: block;
+	float: right;
+	font-weight: normal;
+	color: white;
+	padding: 1px 4px 1px 4px;
+}
+
+#tpl .packages > li > h3 {
+	display: block;
+	background-color: #142556;
+	color: white;
+	padding: 1px 4px 1px 4px;
+	font-weight: bold;
+	display: block;
+}
+
+#tpl ol > li {
+	display: block;
+}
+
+#tpl ol > li .icon {
+	bottom: -2px;
+	position: relative;
+}
+
+#content {
+	border-left-width: 1px;
+	border-left-color: black;
+	border-left-style: white;
+	right: 0px;
+	left: 0px;
+	bottom: 0px;
+	top: 0px;
+	position: fixed;
+	margin-left: 300px;
+	display: block;
+}
+
+#content > iframe {
+	display: block;
+	height: 100%;
+	width: 100%;
+}
diff --git a/doc/lib/index.js b/doc/lib/index.js
new file mode 100644
index 0000000..ad8a535
--- /dev/null
+++ b/doc/lib/index.js
@@ -0,0 +1,81 @@
+// � 2009 EPFL/LAMP
+// written by Gilles Dubochet with contributions by Johannes Rudolph and "spiros"
+
+$(document).ready(function(){
+	cleanPackage($("#tpl"));
+	$("#tpl ol > li span:contains('(class)')").replaceWith("<img class='icon' src='lib/class.png'/>");
+	$("#tpl ol > li span:contains('(object)')").replaceWith("<img class='icon' src='lib/object.png'/>");
+	$("#tpl ol > li span:contains('(trait)')").replaceWith("<img class='icon' src='lib/trait.png'/>");
+	$("#tpl ol > li span:contains('(package)')").replaceWith("<img class='icon' src='lib/package.png'/>");
+	$("#tpl a[href]").click(function(event){
+		$("#content>iframe").attr("src", event.currentTarget.href);
+		return false;
+	});
+	$("#quickflt").focus(function(event) {
+		$("#quickflt").select();
+	});
+	function search() {
+		var query = $("#quickflt").attr("value");
+		// Regexp that matches CamelCase subbits: "BiSe" is
+		// "[a-z]*Bi[a-z]*Se" and matches "BitSet", "ABitSet", ...
+		var queryRegExp = new RegExp(query.replace(/([A-Z])/g,"[a-z]*$1"));
+		$("#tpl ol.templates > li").each(function(){
+			var item = $(this).attr("title");
+			if (item == "" || queryRegExp.test(item)) {
+				$(this).show();
+				$(this).removeClass("hide");
+			}
+			else {
+				$(this).addClass("hide");
+				$(this).hide();
+			};
+		});
+		cleanPackage($("#tpl"));
+		pendingTimeout = undefined;
+	};
+	var pendingTimeout = undefined;
+	$("#quickflt").bind("keyup", function(event) { 
+    	if (event.keyCode == 27) { // escape 
+ 		    $("#quickflt").attr("value", "");
+ 		}
+ 		if (pendingTimeout != undefined) {
+ 			clearTimeout(pendingTimeout);
+ 		}
+ 		pendingTimeout = setTimeout(search, 200); //delay 0.2 sec
+ 	});
+	$("#tpl .packages > li").prepend("<a class='packhide'>hide</a>");
+	$("#tpl .packages > li > a.packhide").click(function(event){
+		var action = $(this).text();
+		if (action == "hide") {
+			$("~ ol", $(this)).hide();
+			$(this).text("show");
+		}
+		else {
+			$("~ ol", $(this)).show();
+			$(this).text("hide");
+		}
+		return false;
+	});
+});
+
+/* Recusively go through the packages and show only those which contain visible items. */
+function cleanPackage(pack) {
+	$("> ol.packages > li", pack).each(function(){ cleanPackage($(this)); });
+	if ($("> ol > li:not(.hide)", pack).length > 0) {
+		pack.show();
+		pack.removeClass("hide");
+	}
+	else {
+		pack.addClass("hide");
+		pack.hide();
+	};
+	if ($("> ol.templates > li:not(.hide)", pack).length > 0) {
+		$("> h3", pack).show();
+		$("> .packhide", pack).show();
+	}
+	else {
+		$("> h3", pack).hide();
+		$("> .packhide", pack).hide();
+	};
+	return false;
+}
diff --git a/doc/lib/jquery.js b/doc/lib/jquery.js
new file mode 100644
index 0000000..b1ae21d
--- /dev/null
+++ b/doc/lib/jquery.js
@@ -0,0 +1,19 @@
+/*
+ * jQuery JavaScript Library v1.3.2
+ * http://jquery.com/
+ *
+ * Copyright (c) 2009 John Resig
+ * Dual licensed under the MIT and GPL licenses.
+ * http://docs.jquery.com/License
+ *
+ * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009)
+ * Revision: 6246
+ */
+(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F<J;F++){var G=M[F];if(G.selected){K=o(G).val();if(H){return K}L.push(K)}}return L}return(E.value||"").replace(/\r/g,"")}return g}if(typeof K==="number"){K+=""}return this.each(function(){if(this.nodeType!=1){return}if(o.isArray(K)&&/radio|checkbox/.test(this.type)){this.checked=(o.inArray(this.value,K)>=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G<E;G++){L.call(K(this[G],H),this.length>1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H<I;H++){if((G=arguments[H])!=null){for(var F in G){var K=J[F],L=G[F];if(J===L){continue}if(E&&L&&typeof L==="object"&&!L.nodeType){J[F]=o.extend(E,K||(L.length!=null?[]:{}),L)}else{if(L!==g){J[F]=L}}}}}return J};var b=/z-?index|font-?weight|opacity|zoom|line-?height/i,q=document.defaultView||{},s=Object.prototype.toString;o.extend({noConflict:function(E){l.$=p;if(E){l.jQuery=y}return o},isFunction:function(E){return s.call(E)==="[object Function]"},isArray:function(E){return s.call(E)==="[object Array]"},isXMLDoc:function(E){return E.nodeType===9&&E.documentElement.nodeName!=="HTML"||!!E.ownerDocument&&o.isXMLDoc(E.ownerDocument)},globalEval:function(G){if(G&&/\S/.test(G)){var F=document.getElementsByTagName("head")[0]||document.documentElement,E=document.createElement("script");E.type="text/javascript";if(o.support.scriptEval){E.appendChild(document.createTextNode(G))}else{E.text=G}F.insertBefore(E,F.firstChild);F.removeChild(E)}},nodeName:function(F,E){return F.nodeName&&F.nodeName.toUpperCase()==E.toUpperCase()},each:function(G,K,F){var E,H=0,I=G.length;if(F){if(I===g){for(E in G){if(K.apply(G[E],F)===false){break}}}else{for(;H<I;){if(K.apply(G[H++],F)===false){break}}}}else{if(I===g){for(E in G){if(K.call(G[E],E,G[E])===false){break}}}else{for(var J=G[0];H<I&&K.call(J,H,J)!==false;J=G[++H]){}}}return G},prop:function(H,I,G,F,E){if(o.isFunction(I)){I=I.call(H,F)}return typeof I==="number"&&G=="curCSS"&&!b.test(E)?I+"px":I},className:{add:function(E,F){o.each((F||"").split(/\s+/),function(G,H){if(E.nodeType==1&&!o.className.has(E.className,H)){E.className+=(E.className?" ":"")+H}})},remove:function(E,F){if(E.nodeType==1){E.className=F!==g?o.grep(E.className.split(/\s+/),function(G){return !o.className.has(F,G)}).join(" "):""}},has:function(F,E){return F&&o.inArray(E,(F.className||F).toString().split(/\s+/))>-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(H,F,J,E){if(F=="width"||F=="height"){var L,G={position:"absolute",visibility:"hidden",display:"block"},K=F=="width"?["Left","Right"]:["Top","Bottom"];function I(){L=F=="width"?H.offsetWidth:H.offsetHeight;if(E==="border"){return}o.each(K,function(){if(!E){L-=parseFloat(o.curCSS(H,"padding"+this,true))||0}if(E==="margin"){L+=parseFloat(o.curCSS(H,"margin"+this,true))||0}else{L-=parseFloat(o.curCSS(H,"border"+this+"Width",true))||0}})}if(H.offsetWidth!==0){I()}else{o.swap(H,G,I)}return Math.max(0,Math.round(L))}return o.curCSS(H,F,J)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,S){if(typeof S==="number"){S+=""}if(!S){return}if(typeof S==="string"){S=S.replace(/(<(\w+)[^>]*?)\/>/g,function(U,V,T){return T.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?U:V+"></"+T+">"});var O=S.replace(/^\s+/,"").substring(0,10).toLowerCase();var Q=!O.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!O.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!O.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!O.indexOf("<td")||!O.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!O.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||!o.support.htmlSerialize&&[1,"div<div>","</div>"]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/<tbody/i.test(S),N=!O.indexOf("<table")&&!R?L.firstChild&&L.firstChild.childNodes:Q[1]=="<table>"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E<F;E++){if(H[E]===G){return E}}return -1},merge:function(H,E){var F=0,G,I=H.length;if(!o.support.getAll){while((G=E[F++])!=null){if(G.nodeType!=8){H[I++]=G}}}else{while((G=E[F++])!=null){H[I++]=G}}return H},unique:function(K){var F=[],E={};try{for(var G=0,H=K.length;G<H;G++){var J=o.data(K[G]);if(!E[J]){E[J]=true;F.push(K[G])}}}catch(I){F=K}return F},grep:function(F,J,E){var G=[];for(var H=0,I=F.length;H<I;H++){if(!E!=!J(F[H],H)){G.push(F[H])}}return G},map:function(E,J){var F=[];for(var G=0,H=E.length;G<H;G++){var I=J(E[G],G);if(I!=null){F[F.length]=I}}return F.concat.apply([],F)}});var C=navigator.userAgent.toLowerCase();o.browser={version:(C.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[0,"0"])[1],safari:/webkit/.test(C),opera:/opera/.test(C),msie:/msie/.test(C)&&!/opera/.test(C),mozilla:/mozilla/.test(C)&&!/(compatible|webkit)/.test(C)};o.each({parent:function(E){return E.parentNode},parents:function(E){return o.dir(E,"parentNode")},next:function(E){return o.nth(E,2,"nextSibling")},prev:function(E){return o.nth(E,2,"previousSibling")},nextAll:function(E){return o.dir(E,"nextSibling")},prevAll:function(E){return o.dir(E,"previousSibling")},siblings:function(E){return o.sibling(E.parentNode.firstChild,E)},children:function(E){return o.sibling(E.firstChild)},contents:function(E){return o.nodeName(E,"iframe")?E.contentDocument||E.contentWindow.document:o.makeArray(E.childNodes)}},function(E,F){o.fn[E]=function(G){var H=o.map(this,F);if(G&&typeof G=="string"){H=o.multiFilter(G,H)}return this.pushStack(o.unique(H),E,G)}});o.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(E,F){o.fn[E]=function(G){var J=[],L=o(G);for(var K=0,H=L.length;K<H;K++){var I=(K>0?this.clone(true):this).get();o.fn[F].apply(o(L[K]),I);J=J.concat(I)}return this.pushStack(J,E,G)}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(this).children().remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}});
+/*
+ * Sizzle CSS Selector Engine - v0.9.3
+ *  Copyright 2009, The Dojo Foundation
+ *  Released under the MIT, BSD, and GPL Licenses.
+ *  More information: http://sizzlejs.com/
+ */
+(function(){var R=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa<ab.length;aa++){if(ab[aa]===ab[aa-1]){ab.splice(aa--,1)}}}}}return ab};F.matches=function(T,U){return F(T,null,null,U)};F.find=function(aa,T,ab){var Z,X;if(!aa){return[]}for(var W=0,V=I.order.length;W<V;W++){var Y=I.order[W],X;if((X=I.match[Y].exec(aa))){var U=RegExp.leftContext;if(U.substr(U.length-1)!=="\\"){X[1]=(X[1]||"").replace(/\\/g,"");Z=I.find[Y](X,T,ab);if(Z!=null){aa=aa.replace(I.match[Y],"");break}}}}if(!Z){Z=T.getElementsByTagName("*")}return{set:Z,expr:aa}};F.filter=function(ad,ac,ag,W){var V=ad,ai=[],aa=ac,Y,T,Z=ac&&ac[0]&&Q(ac[0]);while(ad&&ac.length){for(var ab in I.filter){if((Y=I.match[ab].exec(ad))!=null){var U=I.filter[ab],ah,af;T=false;if(aa==ai){ai=[]}if(I.preFilter[ab]){Y=I.preFilter[ab](Y,aa,ag,ai,W,Z);if(!Y){T=ah=true}else{if(Y===true){continue}}}if(Y){for(var X=0;(af=aa[X])!=null;X++){if(af){ah=U(af,Y,X,aa);var ae=W^!!ah;if(ag&&ah!=null){if(ae){T=true}else{aa[X]=false}}else{if(ae){ai.push(af);T=true}}}}}if(ah!==g){if(!ag){aa=ai}ad=ad.replace(I.match[ab],"");if(!T){return[]}break}}}if(ad==V){if(T==null){throw"Syntax error, unrecognized expression: "+ad}else{break}}V=ad}return aa};var I=F.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF_-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF_-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*_-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF_-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(T){return T.getAttribute("href")}},relative:{"+":function(aa,T,Z){var X=typeof T==="string",ab=X&&!/\W/.test(T),Y=X&&!ab;if(ab&&!Z){T=T.toUpperCase()}for(var W=0,V=aa.length,U;W<V;W++){if((U=aa[W])){while((U=U.previousSibling)&&U.nodeType!==1){}aa[W]=Y||U&&U.nodeName===T?U||false:U===T}}if(Y){F.filter(T,aa,true)}},">":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V<T;V++){var Y=Z[V];if(Y){var W=Y.parentNode;Z[V]=W.nodeName===U?W:false}}}else{for(var V=0,T=Z.length;V<T;V++){var Y=Z[V];if(Y){Z[V]=X?Y.parentNode:Y.parentNode===U}}if(X){F.filter(U,Z,true)}}},"":function(W,U,Y){var V=L++,T=S;if(!U.match(/\W/)){var X=U=Y?U:U.toUpperCase();T=P}T("parentNode",U,V,W,X,Y)},"~":function(W,U,Y){var V=L++,T=S;if(typeof U==="string"&&!U.match(/\W/)){var X=U=Y?U:U.toUpperCase();T=P}T("previousSibling",U,V,W,X,Y)}},find:{ID:function(U,V,W){if(typeof V.getElementById!=="undefined"&&!W){var T=V.getElementById(U[1]);return T?[T]:[]}},NAME:function(V,Y,Z){if(typeof Y.getElementsByName!=="undefined"){var U=[],X=Y.getElementsByName(V[1]);for(var W=0,T=X.length;W<T;W++){if(X[W].getAttribute("name")===V[1]){U.push(X[W])}}return U.length===0?null:U}},TAG:function(T,U){return U.getElementsByTagName(T[1])}},preFilter:{CLASS:function(W,U,V,T,Z,aa){W=" "+W[1].replace(/\\/g,"")+" ";if(aa){return W}for(var X=0,Y;(Y=U[X])!=null;X++){if(Y){if(Z^(Y.className&&(" "+Y.className+" ").indexOf(W)>=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return U<T[3]-0},gt:function(V,U,T){return U>T[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W<T;W++){if(Y[W]===Z){return false}}return true}}}},CHILD:function(T,W){var Z=W[1],U=T;switch(Z){case"only":case"first":while(U=U.previousSibling){if(U.nodeType===1){return false}}if(Z=="first"){return true}U=T;case"last":while(U=U.nextSibling){if(U.nodeType===1){return false}}return true;case"nth":var V=W[2],ac=W[3];if(V==1&&ac==0){return true}var Y=W[0],ab=T.parentNode;if(ab&&(ab.sizcache!==Y||!T.nodeIndex)){var X=0;for(U=ab.firstChild;U;U=U.nextSibling){if(U.nodeType===1){U.nodeIndex=++X}}ab.sizcache=Y}var aa=T.nodeIndex-ac;if(V==0){return aa==0}else{return(aa%V==0&&aa/V>=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V<T;V++){U.push(X[V])}}else{for(var V=0;X[V];V++){U.push(X[V])}}}return U}}var G;if(document.documentElement.compareDocumentPosition){G=function(U,T){var V=U.compareDocumentPosition(T)&4?-1:U===T?0:1;if(V===0){hasDuplicate=true}return V}}else{if("sourceIndex" in document.documentElement){G=function(U,T){var V=U.sourceIndex-T.sourceIndex;if(V===0){hasDuplicate=true}return V}}else{if(document.createRange){G=function(W,U){var V=W.ownerDocument.createRange(),T=U.ownerDocument.createRange();V.selectNode(W);V.collapse(true);T.selectNode(U);T.collapse(true);var X=V.compareBoundaryPoints(Range.START_TO_END,T);if(X===0){hasDuplicate=true}return X}}}}(function(){var U=document.createElement("form"),V="script"+(new Date).getTime();U.innerHTML="<input name='"+V+"'/>";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="<a href='#'></a>";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="<p class='TEST'></p>";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="<div class='test e'></div><div class='test'></div>";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W<V;W++){var T=ad[W];if(T){if(ab&&T.nodeType===1){T.sizcache=Y;T.sizset=W}T=T[U];var X=false;while(T){if(T.sizcache===Y){X=ad[T.sizset];break}if(T.nodeType===1&&!ac){T.sizcache=Y;T.sizset=W}if(T.nodeName===Z){X=T;break}T=T[U]}ad[W]=X}}}function S(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W<V;W++){var T=ad[W];if(T){if(ab&&T.nodeType===1){T.sizcache=Y;T.sizset=W}T=T[U];var X=false;while(T){if(T.sizcache===Y){X=ad[T.sizset];break}if(T.nodeType===1){if(!ac){T.sizcache=Y;T.sizset=W}if(typeof Z!=="string"){if(T===Z){X=true;break}}else{if(F.filter(Z,[T]).length>0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z<U;Z++){F(T,V[Z],W)}return F.filter(X,W)};o.find=F;o.filter=F.filter;o.expr=F.selectors;o.expr[":"]=o.expr.filters;F.selectors.filters.hidden=function(T){return T.offsetWidth===0||T.offsetHeight===0};F.selectors.filters.visible=function(T){return T.offsetWidth>0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0){I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F<E.length){o.event.proxy(G,E[F++])}return this.click(o.event.proxy(G,function(H){this.lastToggle=(this.lastToggle||0)%F;H.preventDefault();return E[this.lastToggle++].apply(this,arguments)||false}))},hover:function(E,F){return this.mouseenter(E).mouseleave(F)},ready:function(E){B();if(o.isReady){E.call(document,o)}else{o.readyList.push(E)}return this},live:function(G,F){var E=o.event.proxy(F);E.guid+=this.selector+G;o(document).bind(i(G,this.selector),this.selector,E);return this},die:function(F,E){o(document).unbind(i(F,this.selector),E?{guid:E.guid+this.selector+F}:null);return this}});function c(H){var E=RegExp("(^|\\.)"+H.type+"(\\.|$)"),G=true,F=[];o.each(o.data(this,"events").live||[],function(I,J){if(E.test(J.type)){var K=o(H.target).closest(J.data)[0];if(K){F.push({elem:K,fn:J})}}});F.sort(function(J,I){return o.data(J.elem,"closest")-o.data(I.elem,"closest")});o.each(F,function(){if(this.fn.call(this.elem,H,this.fn.data)===false){return(G=false)}});return G}function i(F,E){return["live",F,E.replace(/\./g,"`").replace(/ /g,"|")].join(".")}o.extend({isReady:false,readyList:[],ready:function(){if(!o.isReady){o.isReady=true;if(o.readyList){o.each(o.readyList,function(){this.call(document,o)});o.readyList=null}o(document).triggerHandler("ready")}}});var x=false;function B(){if(x){return}x=true;if(document.addEventListener){document.addEventListener("DOMContentLoaded",function(){document.removeEventListener("DOMContentLoaded",arguments.callee,false);o.ready()},false)}else{if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);o.ready()}});if(document.documentElement.doScroll&&l==l.top){(function(){if(o.isReady){return}try{document.documentElement.doScroll("left")}catch(E){setTimeout(arguments.callee,0);return}o.ready()})()}}}o.event.add(l,"load",o.ready)}o.each(("blur,focus,load,resize,scroll,unload,click,dblclick,mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,change,select,submit,keydown,keypress,keyup,error").split(","),function(F,E){o.fn[E]=function(G){return G?this.bind(E,G):this.trigger(E)}});o(l).bind("unload",function(){for(var E in o.cache){if(E!=1&&o.cache[E].handle){o.event.remove(o.cache[E].handle.elem)}}});(function(){o.support={};var F=document.documentElement,G=document.createElement("script"),K=document.createElement("div"),J="script"+(new Date).getTime();K.style.display="none";K.innerHTML='   <link/><table></table><a href="/a" style="color:red;float:left;opacity:.5;">a</a><select><option>text</option></select><object><param/></object>';var H=K.getElementsByTagName("*"),E=K.getElementsByTagName("a")[0];if(!H||!H.length||!E){return}o.support={leadingWhitespace:K.firstChild.nodeType==3,tbody:!K.getElementsByTagName("tbody").length,objectAll:!!K.getElementsByTagName("object")[0].getElementsByTagName("*").length,htmlSerialize:!!K.getElementsByTagName("link").length,style:/red/.test(E.getAttribute("style")),hrefNormalized:E.getAttribute("href")==="/a",opacity:E.style.opacity==="0.5",cssFloat:!!E.style.cssFloat,scriptEval:false,noCloneEvent:true,boxModel:null};G.type="text/javascript";try{G.appendChild(document.createTextNode("window."+J+"=1;"))}catch(I){}F.insertBefore(G,F.firstChild);if(l[J]){o.support.scriptEval=true;delete l[J]}F.removeChild(G);if(K.attachEvent&&K.fireEvent){K.attachEvent("onclick",function(){o.support.noCloneEvent=false;K.detachEvent("onclick",arguments.callee)});K.cloneNode(true).fireEvent("onclick")}o(function(){var L=document.createElement("div");L.style.width=L.style.paddingLeft="1px";document.body.appendChild(L);o.boxModel=o.support.boxModel=L.offsetWidth===2;document.body.removeChild(L).style.display="none"})})();var w=o.support.cssFloat?"cssFloat":"styleFloat";o.props={"for":"htmlFor","class":"className","float":w,cssFloat:w,styleFloat:w,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",tabindex:"tabIndex"};o.fn.extend({_load:o.fn.load,load:function(G,J,K){if(typeof G!=="string"){return this._load(G)}var I=G.indexOf(" ");if(I>=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("<div/>").append(M.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();T.onload=T.onreadystatechange=null;H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function(){G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H<F;H++){var E=o.data(this[H],"olddisplay");this[H].style.display=E||"";if(o.css(this[H],"display")==="none"){var G=this[H].tagName,K;if(m[G]){K=m[G]}else{var I=o("<"+G+" />").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}o.data(this[H],"olddisplay",K)}}for(var H=0,F=this.length;H<F;H++){this[H].style.display=o.data(this[H],"olddisplay")||""}return this}},hide:function(H,I){if(H){return this.animate(t("hide",3),H,I)}else{for(var G=0,F=this.length;G<F;G++){var E=o.data(this[G],"olddisplay");if(!E&&E!=="none"){o.data(this[G],"olddisplay",o.css(this[G],"display"))}}for(var G=0,F=this.length;G<F;G++){this[G].style.display="none"}return this}},_toggle:o.fn.toggle,toggle:function(G,F){var E=typeof G==="boolean";return o.isFunction(G)&&o.isFunction(F)?this._toggle.apply(this,arguments):G==null||E?this.each(function(){var H=E?G:o(this).is(":hidden");o(this)[H?"show":"hide"]()}):this.animate(t("toggle",3),G,F)},fadeTo:function(E,G,F){return this.animate({opacity:G},E,F)},animate:function(I,F,H,G){var E=o.speed(F,H,G);return this[E.queue===false?"each":"queue"](function(){var K=o.extend({},E),M,L=this.nodeType==1&&o(this).is(":hidden"),J=this;for(M in I){if(I[M]=="hide"&&L||I[M]=="show"&&!L){return K.complete.call(this)}if((M=="height"||M=="width")&&this.style){K.display=o.css(this,"display");K.overflow=this.style.overflow}}if(K.overflow!=null){this.style.overflow="hidden"}K.curAnim=o.extend({},I);o.each(I,function(O,S){var R=new o.fx(J,K,O);if(/toggle|show|hide/.test(S)){R[S=="toggle"?L?"show":"hide":S](I)}else{var Q=S.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),T=R.cur(true)||0;if(Q){var N=parseFloat(Q[2]),P=Q[3]||"px";if(P!="px"){J.style[O]=(N||1)+P;T=((N||1)/R.cur(true))*T;J.style[O]=T+P}if(Q[1]){N=((Q[1]=="-="?-1:1)*N)+T}R.custom(T,N,P)}else{R.custom(T,S,"")}}});return true})},stop:function(F,E){var G=o.timers;if(F){this.queue([])}this.each(function(){for(var H=G.length-1;H>=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)&&!n){n=setInterval(function(){var K=o.timers;for(var J=0;J<K.length;J++){if(!K[J]()){K.splice(J--,1)}}if(!K.length){clearInterval(n);n=g}},13)}},show:function(){this.options.orig[this.prop]=o.attr(this.elem.style,this.prop);this.options.show=true;this.custom(this.prop=="width"||this.prop=="height"?1:0,this.cur());o(this.elem).show()},hide:function(){this.options.orig[this.prop]=o.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(H){var G=e();if(H||G>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;" cellpadding="0" cellspacing="0"><tr><td></td></tr></table>';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(I,G){var E=I?"Left":"Top",H=I?"Right":"Bottom",F=G.toLowerCase();o.fn["inner"+G]=function(){return this[0]?o.css(this[0],F,false,"padding"):null};o.fn["outer"+G]=function(K){return this[0]?o.css(this[0],F,false,K?"margin":"border"):null};var J=G.toLowerCase();o.fn[J]=function(K){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+G]||document.body["client"+G]:this[0]==document?Math.max(document.documentElement["client"+G],document.body["scroll"+G],document.documentElement["scroll"+G],document.body["offset"+G],document.documentElement["offset"+G]):K===g?(this.length?o.css(this[0],J):null):this.css(J,typeof K==="string"?K:K+"px")}})})();
\ No newline at end of file
diff --git a/doc/lib/object.png b/doc/lib/object.png
new file mode 100644
index 0000000..886cd5c
Binary files /dev/null and b/doc/lib/object.png differ
diff --git a/doc/lib/object_big.png b/doc/lib/object_big.png
new file mode 100644
index 0000000..0a483ca
Binary files /dev/null and b/doc/lib/object_big.png differ
diff --git a/doc/lib/package.png b/doc/lib/package.png
new file mode 100644
index 0000000..c3eef6e
Binary files /dev/null and b/doc/lib/package.png differ
diff --git a/doc/lib/package_big.png b/doc/lib/package_big.png
new file mode 100644
index 0000000..5ab05cc
Binary files /dev/null and b/doc/lib/package_big.png differ
diff --git a/doc/lib/template.css b/doc/lib/template.css
new file mode 100644
index 0000000..517c767
--- /dev/null
+++ b/doc/lib/template.css
@@ -0,0 +1,259 @@
+* {
+	color: black;
+	text-decoration: none;
+	font-family: inherit;
+	font-size: inherit;
+	font-weight: normal;
+	border-width: 0px;
+	padding: 0px;
+	margin: 0px;
+}
+
+body {
+	font-family: sans-serif;
+	font-size: 10pt;
+}
+
+a {
+	cursor: pointer;
+}
+
+a:hover {
+	text-decoration: underline;
+}
+
+#owner {
+	padding: 4px;
+	font-size: 12pt;
+	display: block;
+}
+
+.value #owner {
+	background-color: #ced8f4;
+}
+
+.type #owner {
+	background-color: #f4cece;
+}
+
+#definition {
+	display: block;
+	padding: 6px;
+}
+
+#definition > img {
+	float: left;
+}
+
+#definition > h1 {
+	padding: 12px 0 12px 6px;
+	color: white;
+	font-size: 24pt;
+	display: inline-block;
+}
+
+.value #definition {
+	background-color: #142556;
+}
+
+.type #definition {
+	background-color: #561414;
+}
+
+#comment {
+	padding-left: 8px;
+}
+
+#values > h3 {
+	color: white;
+	padding: 4px;
+	background-color: #142556;
+	font-size: 12pt;
+	font-weight: bold;
+}
+
+#types > h3 {
+	padding: 4px;
+	color: white;
+	font-weight: bold;
+	font-size: 12pt;
+	background-color: #561414;
+}
+
+#constructors > h3 {
+	padding: 4px;
+	color: white;
+	font-weight: bold;
+	font-size: 12pt;
+	background-color: #000000;
+}
+
+/* Member cells */
+
+div.members > ol {
+	background-color: white;
+}
+
+div.members > ol > li {
+	display: block;
+}
+
+/* Member signatures */
+
+.signature {
+	padding: 1px;
+	font-family: monospace;
+	font-size: 10pt;
+	clear: both;
+	display: block;
+	background-color: #dddddd;
+}
+
+.signature .kind {
+	text-align: right;
+	float: left;
+	width: 72px;
+}
+
+.signature .symbol {
+	display: block;
+	margin-left: 80px;
+}
+
+.signature .name {
+	display: inline-block;
+	font-weight: bold;
+}
+
+#values .signature .name {
+	color: #142556;
+}
+
+#types .signature .name {
+	color: #561414;
+}
+
+/* Comments text formating */
+
+.cmt {}
+
+.cmt p {
+	margin: 2px 0 2px 0;
+}
+
+.cmt code {
+	font-family: monospace;
+	font-size: small;
+}
+
+.cmt pre {
+	display: block;
+	font-family: monospace;
+	font-size: small;
+	margin: 2px 0 2px 0;
+}
+
+/* Comments structured layout */
+
+p.comment {
+	display: block;
+	margin-left: 80px;
+}
+
+p.shortcomment {
+	display: block;
+	margin-left: 80px;
+	cursor: help;
+}
+
+div.fullcomment {
+	display: block;
+	margin: 10px 0 10px 0;
+}
+
+#template div.fullcomment {
+	margin: 6px 0 6px 80px;
+}
+
+div.fullcomment .block {
+	padding: 2px 0 2px 0;
+	border-top: 1px solid black;
+	border-bottom: 1px solid black;
+}
+
+div.fullcomment .block + .block {
+	border-top: none;
+}
+
+div.fullcomment .block > h5 {
+	font-style: italic;
+	font-weight: normal;
+	display: inline-block;
+}
+
+div.fullcomment .comment {
+	margin: 6px 0 6px 0;
+}
+
+div.fullcomment dl.paramcmts > dt {
+	display: block;
+	float: left;
+	font-weight: bold;
+	margin: 2px 4px 2px 0;
+}
+
+div.fullcomment dl.paramcmts > dd {
+	display: block;
+	padding-left: 80px;
+	border-top: 1px dashed black;
+	border-bottom: 1px dashed black;
+}
+
+div.fullcomment dl.paramcmts > dt:first-child + dd {
+	border-top: none;
+}
+
+div.fullcomment dl.paramcmts > dd:last-child {
+	border-bottom: none;
+}
+
+div.fullcomment dl.paramcmts > dd + dt + dd {
+	border-top: none;
+}
+
+/* Members filter tool */
+
+#mbrsel {
+	padding: 4px;
+	background-color: #cccccc;
+	display: block;
+}
+
+#mbrsel > div > h3 {
+	padding: 4px;
+	display: block;
+	float: left;
+}
+
+#mbrsel > div > ol {
+	margin-left: 80px;
+}
+
+#mbrsel > div > ol > li {
+	display: block;
+	padding: 4px 8px 4px 8px;
+	font-weight: bold;
+	background-color: white;
+	display: inline-block;
+	cursor: crosshair;
+}
+
+#mbrsel > div > ol > li.in {
+	background-color: white;
+}
+
+#mbrsel > div > ol > li.out {
+	color: #888888;
+	background-color: #bbbbbb;
+}
+
diff --git a/doc/lib/template.js b/doc/lib/template.js
new file mode 100644
index 0000000..2f5efb1
--- /dev/null
+++ b/doc/lib/template.js
@@ -0,0 +1,100 @@
+$(document).ready(function(){
+	var prefilters = $("#ancestors > ol > li").filter(function(){
+		var name = $(this).attr("name");
+		return name == "scala.Any" || name == "scala.AnyRef";
+	});
+	prefilters.removeClass("in");
+	prefilters.addClass("out");
+	filterInherit();
+	$("#ancestors > ol > li").click(function(){
+		if ($(this).hasClass("in")) {
+			$(this).removeClass("in");
+			$(this).addClass("out");
+		}
+		else if ($(this).hasClass("out")) {
+			$(this).removeClass("out");
+			$(this).addClass("in");
+		};
+		filterInherit();
+	});
+	$(".signature .symbol .extype").hover(
+		function(){
+			var full = $(this).attr("name");
+			var short = $(this).text();
+			$(this).attr("name", short);
+			$(this).text(full);
+		},
+		function(){
+			var short = $(this).attr("name");
+			var full = $(this).text();
+			$(this).attr("name", full);
+			$(this).text(short);
+		}
+	);
+	$("#template div.fullcomment").hide();
+	var docAllSigs = $("#template .signature");
+	function commentShowFct(fullComment){
+		var vis = $(":visible", fullComment);
+		if (vis.length > 0) {
+			fullComment.slideUp(100);
+		}
+		else {
+			fullComment.slideDown(100);
+		}
+	};
+	var docShowSigs = docAllSigs.filter(function(){
+		return $("+ div.fullcomment", $(this)).length > 0;
+	});
+	docShowSigs.css("cursor", "help");
+	docShowSigs.click(function(){
+		commentShowFct($("+ div.fullcomment", $(this)));
+	});
+	function commentToggleFct(shortComment){
+		var vis = $("~ div.fullcomment:visible", shortComment);
+		if (vis.length > 0) {
+			shortComment.slideDown(100);
+			vis.slideUp(100);
+		}
+		else {
+			var hid = $("~ div.fullcomment:hidden", shortComment);
+			hid.slideDown(100);
+			shortComment.slideUp(100);
+		}
+	};
+	var docToggleSigs = docAllSigs.filter(function(){
+		return $("+ p.shortcomment", $(this)).length > 0;
+	});
+	docToggleSigs.css("cursor", "help");
+	docToggleSigs.click(function(){
+		commentToggleFct($("+ p.shortcomment", $(this)));
+	});
+	$("p.shortcomment").click(function(){
+		commentToggleFct($(this));
+	});
+});
+
+function filterInherit() {
+	$("#mbrsel > div > ol > li.in").each(function(){
+		findMembersByOwner($(this).attr("name")).show();
+	});
+	$("#mbrsel > div > ol > li.out").each(function(){
+		findMembersByOwner($(this).attr("name")).hide();
+	});
+	return false;
+};
+
+function findMembersByOwner(owner0) {
+	return $(".members > ol > li").filter(function(){
+		var qualName1 = $(this).attr("name");
+		if (qualName1 == undefined) return false;
+		return owner0 == qualName1.slice(0, qualName1.indexOf("#"));
+	});
+};
+
+function findMemberByName(name0) {
+	return $(".members > ol > li").filter(function(){
+		var qualName1 = $(this).attr("name");
+		if (qualName1 == undefined) return false;
+		return name0 == qualName1.slice(qualName1.indexOf("#") + 1);
+	}).eq(0);
+};
\ No newline at end of file
diff --git a/doc/lib/trait.png b/doc/lib/trait.png
new file mode 100644
index 0000000..b1b0430
Binary files /dev/null and b/doc/lib/trait.png differ
diff --git a/doc/lib/trait_big.png b/doc/lib/trait_big.png
new file mode 100644
index 0000000..63be0d7
Binary files /dev/null and b/doc/lib/trait_big.png differ
diff --git a/doc/modules.html b/doc/modules.html
deleted file mode 100644
index 894ca01..0000000
--- a/doc/modules.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>List of all packages</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script>
-        </head>
-        <body onload="init()"><div>
-        <div class="doctitle-larger">SiMS</div>
-        <a href="all-classes.html" target="classesFrame" onclick="resetKind();">All objects and classes</a>
-      </div><div class="kinds">Packages</div><ul class="list"><li><a href="graphyx$package.html" target="classesFrame" onclick="resetKind();">
-          graphyx</a></li>
-<li><a href="graphyx/actors$package.html" target="classesFrame" onclick="resetKind();">
-          graphyx.actors</a></li>
-<li><a href="graphyx/graphics$package.html" target="classesFrame" onclick="resetKind();">
-          graphyx.graphics</a></li>
-<li><a href="graphyx/gui$package.html" target="classesFrame" onclick="resetKind();">
-          graphyx.gui</a></li>
-<li><a href="graphyx/tests$package.html" target="classesFrame" onclick="resetKind();">
-          graphyx.tests</a></li>
-<li><a href="sims/collision$package.html" target="classesFrame" onclick="resetKind();">
-          sims.collision</a></li>
-<li><a href="sims/dynamics$package.html" target="classesFrame" onclick="resetKind();">
-          sims.dynamics</a></li>
-<li><a href="sims/dynamics/joints$package.html" target="classesFrame" onclick="resetKind();">
-          sims.dynamics.joints</a></li>
-<li><a href="sims/dynamics/joints/test$package.html" target="classesFrame" onclick="resetKind();">
-          sims.dynamics.joints.test</a></li>
-<li><a href="sims/geometry$package.html" target="classesFrame" onclick="resetKind();">
-          sims.geometry</a></li>
-<li><a href="sims/math$package.html" target="classesFrame" onclick="resetKind();">
-          sims.math</a></li>
-<li><a href="sims/prefabs$package.html" target="classesFrame" onclick="resetKind();">
-          sims.prefabs</a></li>
-<li><a href="sims/util$package.html" target="classesFrame" onclick="resetKind();">
-          sims.util</a></li>
-      </ul></body>
-      </html>
\ No newline at end of file
diff --git a/doc/nav-classes.html b/doc/nav-classes.html
deleted file mode 100644
index 505f7c6..0000000
--- a/doc/nav-classes.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>navigation</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script>
-        </head>
-        <body style="margin:1px 0 0 1px; padding:1px 0 0 1px;"><form>
-        <select onchange="gotoKind()" id="kinds">
-          <option value="#Classes" selected="selected">Classes</option>
-          <option value="#Objects">Objects</option>
-        </select>
-        <span style="font-family:Courier;word-spacing:-8px;" id="alphabet"><a href="javascript:gotoName('A')">A</a>
-<a href="javascript:gotoName('B')">B</a>
-<a href="javascript:gotoName('C')">C</a>
-<a href="javascript:gotoName('D')">D</a>
-<a href="javascript:gotoName('E')">E</a>
-<a href="javascript:gotoName('G')">G</a>
-<a href="javascript:gotoName('I')">I</a>
-<a href="javascript:gotoName('L')">L</a>
-<a href="javascript:gotoName('M')">M</a>
-<a href="javascript:gotoName('P')">P</a>
-<a href="javascript:gotoName('R')">R</a>
-<a href="javascript:gotoName('T')">T</a>
-<a href="javascript:gotoName('V')">V</a>
-<a href="javascript:gotoName('X')">X</a>
-        </span>
-      </form></body>
-      </html>
\ No newline at end of file
diff --git a/doc/package.html b/doc/package.html
new file mode 100644
index 0000000..fd2a529
--- /dev/null
+++ b/doc/package.html
@@ -0,0 +1,70 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for _root_</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      
+
+      <div id="definition">
+        <img src="lib/package_big.png" />
+        <h1>root package</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">root</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="_root_.graphyx">
+      <h4 class="signature"><a href="graphyx/package.html">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">graphyx</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="_root_.sims">
+      <h4 class="signature"><a href="sims/package.html">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">sims</span>
+      </span>
+      </a></h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/root-content.html b/doc/root-content.html
deleted file mode 100644
index e477111..0000000
--- a/doc/root-content.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>All Packages</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script>
-        </head>
-        <body onload="init()"><div class="page-title"><div>Simple Mechanics Simulator (SiMS) API</div></div><p><div>This document is the API specification for SiMS</div></p><hr></hr><table summary="" cellpadding="3" class="member">
-        <tr><td class="title" colspan="2">Package Summary</td></tr> 
-        <tr><td class="signature">
-          <code>package
-          <a href="graphyx$content.html" target="_self">graphyx</a>
-          </code>
-        </td></tr>
-<tr><td class="signature">
-          <code>package
-          <a href="graphyx/actors$content.html" target="_self">graphyx.actors</a>
-          </code>
-        </td></tr>
-<tr><td class="signature">
-          <code>package
-          <a href="graphyx/graphics$content.html" target="_self">graphyx.graphics</a>
-          </code>
-        </td></tr>
-<tr><td class="signature">
-          <code>package
-          <a href="graphyx/gui$content.html" target="_self">graphyx.gui</a>
-          </code>
-        </td></tr>
-<tr><td class="signature">
-          <code>package
-          <a href="graphyx/tests$content.html" target="_self">graphyx.tests</a>
-          </code>
-        </td></tr>
-<tr><td class="signature">
-          <code>package
-          <a href="sims/collision$content.html" target="_self">sims.collision</a>
-          </code>
-        </td></tr>
-<tr><td class="signature">
-          <code>package
-          <a href="sims/dynamics$content.html" target="_self">sims.dynamics</a>
-          </code>
-        </td></tr>
-<tr><td class="signature">
-          <code>package
-          <a href="sims/dynamics/joints$content.html" target="_self">sims.dynamics.joints</a>
-          </code>
-        </td></tr>
-<tr><td class="signature">
-          <code>package
-          <a href="sims/dynamics/joints/test$content.html" target="_self">sims.dynamics.joints.test</a>
-          </code>
-        </td></tr>
-<tr><td class="signature">
-          <code>package
-          <a href="sims/geometry$content.html" target="_self">sims.geometry</a>
-          </code>
-        </td></tr>
-<tr><td class="signature">
-          <code>package
-          <a href="sims/math$content.html" target="_self">sims.math</a>
-          </code>
-        </td></tr>
-<tr><td class="signature">
-          <code>package
-          <a href="sims/prefabs$content.html" target="_self">sims.prefabs</a>
-          </code>
-        </td></tr>
-<tr><td class="signature">
-          <code>package
-          <a href="sims/util$content.html" target="_self">sims.util</a>
-          </code>
-        </td></tr>
-      </table></body>
-      </html>
\ No newline at end of file
diff --git a/doc/script.js b/doc/script.js
deleted file mode 100644
index 9728804..0000000
--- a/doc/script.js
+++ /dev/null
@@ -1,112 +0,0 @@
-<!--
-// NSC -- new Scala compiler
-// Copyright 2005-2009 LAMP/EPFL
-// @author  Stephane Micheloud
-
-// $Id: script.js 17936 2009-05-31 18:30:21Z cunei $
-
-function setWindowTitle(title) {
-  parent.document.title = title;
-}
-
-var java_api_root = 'http://java.sun.com/javase/6/docs/api/';
-//var java_api_root = 'http://java.sun.com/j2se/1.5.0/docs/api/';
-//var java_api_root = 'http://lamp.epfl.ch/~linuxsoft/java/jdk1.5/docs/api/';
-
-var javax_servlet_api_root = 'http://java.sun.com/products/servlet/2.3/javadoc/';
-
-var scala_doc_url = parent.document.URL;
-var scala_api_root = scala_doc_url.substring(0, scala_doc_url.lastIndexOf("/")+1);
-
-var ant_api_root = 'http://lamp.epfl.ch/~linuxsoft/ant/manual/api/';
-//var ant_api_root = 'http://www.net-freaks.org/doc/ant-1.6.5/manual/api/';
-
-var eclipse_api_root = 'http://help.eclipse.org/help32/topic/org.eclipse.platform.doc.isv/reference/api/';
-
-var fjbg_api_root = 'http://lamp.epfl.ch/~linuxsoft/fjbg/api/';
-
-var liftweb_api_root = 'http://lamp.epfl.ch/~linuxsoft/liftweb/apidocs/';
-
-function get_api_root(key) {
-  root = null;
-  if      (key.indexOf("ch/epfl/lamp/fjbg/") == 0) { root = fjbg_api_root; }
-  else if (key.indexOf("java/"             ) == 0) { root = java_api_root; }
-  else if (key.indexOf("javax/"            ) == 0) { root = java_api_root; }
-  else if (key.indexOf("javax/servlet/"    ) == 0) { root = javax_servlet_api_root; }
-  else if (key.indexOf("scala/"            ) == 0) { root = scala_api_root; }
-  else if (key.indexOf("org/apache/tools/" ) == 0) { root = ant_api_root; }
-  else if (key.indexOf("org/eclipse/"      ) == 0) { root = eclipse_api_root; }
-  else if (key.indexOf("net/liftweb/"      ) == 0) { root = liftweb_api_root; }
-  return root;
-}
-
-var scala_src_root = 'http://lampsvn.epfl.ch/trac/scala/browser/scala/tags/R_2_7_5_final/';
-var lib_src_root = scala_src_root + 'src/library/';
-var comp_src_root = scala_src_root + 'src/compiler/';
-var actors_src_root = scala_src_root + 'src/actors/';
-var dbc_src_root = scala_src_root + 'src/dbc/';
-var swing_src_root = scala_src_root + 'src/swing/';
-
-//var liftweb_src_root = 'http://liftweb.googlecode.com/svn/trunk/liftweb/lift/src/main/scala/';
-
-function get_src_root(key) {
-  root = null;
-  if      (key.indexOf("scala/actors/") == 0) { root = actors_src_root; }
-  else if (key.indexOf("scala/dbc/"   ) == 0) { root = dbc_src_root; }
-  else if (key.indexOf("scala/swing/" ) == 0) { root = swing_src_root; }
-  else if (key.indexOf("scala/tools/" ) == 0) { root = comp_src_root; }
-  else if (key.indexOf("scala/"       ) == 0) { root = lib_src_root; }
-  //else if (key.indexOf("net/liftweb/" ) == 0) { root = liftweb_src_root; }
-  return root;
-}
-
-function init() {
-  elems = document.getElementsByTagName('a');
-  for (i = 0; i < elems.length; i++) {
-    try {
-      key = elems[i].getAttribute('class');
-      href = elems[i].getAttribute('href');
-      api_root = get_api_root(key);
-      if (api_root != null) {
-        href1 = href.substring(href.lastIndexOf("#"))
-        value = api_root + key + ".html" + href1;
-        elems[i].setAttribute('href', value);
-      }
-      src_root = get_src_root(key);
-      if (src_root != null) {
-        value = src_root + key + '.scala?view=markup';
-        elems[i].setAttribute('href', value);
-        elems[i].setAttribute('target' , '_top');
-      }
-    }
-    catch (e) {
-      // do nothing
-    }
-  }
-}
-
-function getLocation() {
-  kinds = parent.navigationFrame.document.getElementById("kinds");
-  oldLocation = parent.classesFrame.window.location.href;
-  //alert("oldLocation="+oldLocation);
-  pos = oldLocation.lastIndexOf("#");
-  classesURL = (pos > 0) ? oldLocation.substring(0, pos) : oldLocation;
-  newLocation = classesURL + kinds.options[kinds.selectedIndex].value;
-  //alert("newLocation="+newLocation);
-  return newLocation;
-}
-
-function gotoKind() {
-  parent.classesFrame.window.location = getLocation();
-}
-
-function resetKind() {
-  kinds = parent.navigationFrame.document.getElementById("kinds");
-  kinds.selectedIndex = 0;
-}
-
-function gotoName(letter) {
-  parent.classesFrame.window.location = getLocation() + "_" + letter;
-}
--->
-
diff --git a/doc/sims/collision$content.html b/doc/sims/collision$content.html
deleted file mode 100644
index 1aa99c6..0000000
--- a/doc/sims/collision$content.html
+++ /dev/null
@@ -1,190 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>All classes and objects in sims.collision</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../script.js"></script>
-        </head>
-        <body onload="init()"><div class="page-title"><div>Simple Mechanics Simulator (SiMS) API</div></div><p><div>This document is the API specification for SiMS</div></p><table summary="" cellpadding="3" class="member">
-        <tr><td class="title" colspan="2">Class Summary</td></tr>
-        <tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/collision/AABB.html" target="_self">AABB</a></em>
-        (<code>val </code><em>minVertex</em> : <a href="../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <code>val </code><em>maxVertex</em> : <a href="../sims/geometry/Vector2D.html" target="_self">Vector2D</a>)<code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        <div>Axis Aligned Bounding Boxes (AABBs) are rectangles that frame a shape.
- Their X-Axis and Y-Axis orientation makes it easy to test two AABBs for overlap.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/collision/CircleCollision.html" target="_self">CircleCollision</a></em>
-        (<code>val </code><em>c1</em> : <a href="../sims/dynamics/Circle.html" target="_self">Circle</a>, <code>val </code><em>c2</em> : <a href="../sims/dynamics/Circle.html" target="_self">Circle</a>)<code> extends </code><a href="../sims/collision/Collision.html" target="_self">Collision</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        <div>Collision between two circles.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/collision/Collision.html" target="_self">Collision</a></em>
-        <code> extends </code><a href="../sims/dynamics/Constraint.html" target="_self">Constraint</a><code> with </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        <div>Collision between two shapes. Contains methods to compute the collision response.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/collision/Detector.html" target="_self">Detector</a></em>
-        <code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        <div>A world detects its collisions through concrete implementations of this class.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/collision/GridDetector.html" target="_self">GridDetector</a></em>
-        (<code>val override </code><em>world</em> : <a href="../sims/dynamics/World.html" target="_self">World</a>)<code> extends </code><a href="../sims/collision/Detector.html" target="_self">Detector</a>
-        
-        <div>A conrete implementation of <code>Detector</code>. <code>GridDetector</code> divides the world into a grid
- for faster collision detection.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/collision/Overlap.html" target="_self">Overlap</a></em>
-        (<code>val </code><em>poly</em> : <a href="../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a>, <code>val </code><em>sideNum</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>, <code>val </code><em>overlap</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>)<code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/collision/Pair.html" target="_self">Pair</a></em>
-        (<code>val </code><em>s1</em> : <a href="../sims/dynamics/Shape.html" target="_self">Shape</a>, <code>val </code><em>s2</em> : <a href="../sims/dynamics/Shape.html" target="_self">Shape</a>)<code> extends </code>(<a href="../sims/dynamics/Shape.html" target="_self">Shape</a>, <a href="../sims/dynamics/Shape.html" target="_self">Shape</a>)
-        
-        <div>Pair of shapes.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/collision/PolyCircleCollision.html" target="_self">PolyCircleCollision</a></em>
-        (<code>val </code><em>p</em> : <a href="../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a>, <code>val </code><em>c</em> : <a href="../sims/dynamics/Circle.html" target="_self">Circle</a>)<code> extends </code><a href="../sims/collision/Collision.html" target="_self">Collision</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        <div>Collision between a convex polygon and a circle.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/collision/PolyCollision.html" target="_self">PolyCollision</a></em>
-        (<code>val </code><em>p1</em> : <a href="../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a>, <code>val </code><em>p2</em> : <a href="../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a>)<code> extends </code><a href="../sims/collision/Collision.html" target="_self">Collision</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        <div>Collision between two convex polygons.</div>
-      </td>
-    </tr>        
-        </table>
-<table summary="" cellpadding="3" class="member">
-        <tr><td class="title" colspan="2">Object Summary</td></tr>
-        <tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/collision/AABB$object.html" target="_self">AABB</a></em>
-        <code> extends </code>(<a href="../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <a href="../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) =&gt; <a href="../sims/collision/AABB.html" target="_self">AABB</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/collision/CircleCollision$object.html" target="_self">CircleCollision</a></em>
-        <code> extends </code>(<a href="../sims/dynamics/Circle.html" target="_self">Circle</a>, <a href="../sims/dynamics/Circle.html" target="_self">Circle</a>) =&gt; <a href="../sims/collision/CircleCollision.html" target="_self">CircleCollision</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/collision/Collision$object.html" target="_self">Collision</a></em>
-        <code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/collision/Overlap$object.html" target="_self">Overlap</a></em>
-        <code> extends </code>(<a href="../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) =&gt; <a href="../sims/collision/Overlap.html" target="_self">Overlap</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/collision/Pair$object.html" target="_self">Pair</a></em>
-        <code> extends </code>(<a href="../sims/dynamics/Shape.html" target="_self">Shape</a>, <a href="../sims/dynamics/Shape.html" target="_self">Shape</a>) =&gt; <a href="../sims/collision/Pair.html" target="_self">Pair</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/collision/PolyCircleCollision$object.html" target="_self">PolyCircleCollision</a></em>
-        <code> extends </code>(<a href="../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a>, <a href="../sims/dynamics/Circle.html" target="_self">Circle</a>) =&gt; <a href="../sims/collision/PolyCircleCollision.html" target="_self">PolyCircleCollision</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/collision/PolyCollision$object.html" target="_self">PolyCollision</a></em>
-        <code> extends </code>(<a href="../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a>, <a href="../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a>) =&gt; <a href="../sims/collision/PolyCollision.html" target="_self">PolyCollision</a>
-        
-        
-      </td>
-    </tr>        
-        </table></body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/collision$package.html b/doc/sims/collision$package.html
deleted file mode 100644
index 0871d60..0000000
--- a/doc/sims/collision$package.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>List of classes and objects in package sims.collision</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../script.js"></script>
-        </head>
-        <body onload="init()"><table summary="" class="navigation">
-          <tr><td class="navigation-links" valign="top">
-            <a href="../sims/collision$content.html" target="contentFrame">sims.collision</a>
-          </td></tr>
-        </table><div><div class="kinds" id="Classes">Classes</div><ul class="list">
-        <li id="Classes_A"><a href="../sims/collision/AABB.html" target="contentFrame">AABB</a></li>
-<li id="Classes_C"><a href="../sims/collision/CircleCollision.html" target="contentFrame">CircleCollision</a></li>
-<li><a href="../sims/collision/Collision.html" target="contentFrame">Collision</a></li>
-<li id="Classes_D"><a href="../sims/collision/Detector.html" target="contentFrame">Detector</a></li>
-<li id="Classes_G"><a href="../sims/collision/GridDetector.html" target="contentFrame">GridDetector</a></li>
-<li id="Classes_O"><a href="../sims/collision/Overlap.html" target="contentFrame">Overlap</a></li>
-<li id="Classes_P"><a href="../sims/collision/Pair.html" target="contentFrame">Pair</a></li>
-<li><a href="../sims/collision/PolyCircleCollision.html" target="contentFrame">PolyCircleCollision</a></li>
-<li><a href="../sims/collision/PolyCollision.html" target="contentFrame">PolyCollision</a></li>
-        </ul>
-<div class="kinds" id="Objects">Objects</div><ul class="list">
-        <li id="Objects_A"><a href="../sims/collision/AABB$object.html" target="contentFrame">AABB</a></li>
-<li id="Objects_C"><a href="../sims/collision/CircleCollision$object.html" target="contentFrame">CircleCollision</a></li>
-<li><a href="../sims/collision/Collision$object.html" target="contentFrame">Collision</a></li>
-<li id="Objects_O"><a href="../sims/collision/Overlap$object.html" target="contentFrame">Overlap</a></li>
-<li id="Objects_P"><a href="../sims/collision/Pair$object.html" target="contentFrame">Pair</a></li>
-<li><a href="../sims/collision/PolyCircleCollision$object.html" target="contentFrame">PolyCircleCollision</a></li>
-<li><a href="../sims/collision/PolyCollision$object.html" target="contentFrame">PolyCollision</a></li>
-        </ul></div></body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/collision/AABB$object.html b/doc/sims/collision/AABB$object.html
deleted file mode 100644
index 6d5d29d..0000000
--- a/doc/sims/collision/AABB$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object AABB in sims.collision</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/collision$package.html" target="_self">sims.collision</a>
-        <br></br>
-        <span class="entity">object  AABB</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/collision/AABB"><code>sims/collision/AABB.scala</code></a>]
-      </div><hr></hr>
-      <a name="AABB"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>AABB</em>
-      </dt>
-      <dd><code> extends </code>(<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) =&gt; <a href="../../sims/collision/AABB.html" target="_self">AABB</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function2">scala.Function2</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function2">scala.Function2.toString</a>, <a href="#curry" target="contentFrame" class="scala/Function2">scala.Function2.curry</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/collision/AABB.html b/doc/sims/collision/AABB.html
index a687d9d..9666bff 100644
--- a/doc/sims/collision/AABB.html
+++ b/doc/sims/collision/AABB.html
@@ -1,308 +1,242 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class AABB in sims.collision</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for sims.collision.AABB</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/collision$package.html" target="_self">sims.collision</a>
-        <br></br>
-        <span class="entity">class  AABB</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/collision/AABB"><code>sims/collision/AABB.scala</code></a>]
-      </div><hr></hr>
-      <a name="AABB"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>AABB</em>(<code>val </code><em>minVertex</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <code>val </code><em>maxVertex</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>)
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
-      <dl><dd>Axis Aligned Bounding Boxes (AABBs) are rectangles that frame a shape.
- Their X-Axis and Y-Axis orientation makes it easy to test two AABBs for overlap.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>minVertex - </code>Position vector of the bottom-left vertex</dd><dd><code>maxVertex - </code>Position vector of the upper-right vertex</dd></dl>
-    <dl>
-      <dt style="margin:10px 0 0 20px;"><b>Direct Known Subclasses:</b></dt>
-      <dd><a href="../../graphyx/graphics/GraphicalAABB.html" target="_self">GraphicalAABB</a></dd>
-      </dl><hr></hr>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">collision</a></p>
 
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>AABB</h1>
+      </div>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/AABB.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/AABB.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/AABB.html#overlaps%28sims.collision.AABB%29" target="_self">overlaps</a></em>
-        (<em>box</em> : <a href="../../sims/collision/AABB.html" target="_self">AABB</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>Checks this AABB with <code>box</code> for overlap.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/AABB.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/AABB.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/AABB.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/AABB.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">AABB</span><span class="params">(<span name="minVertex">minVertex: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="maxVertex">maxVertex: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result"> extends <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>Axis Aligned Bounding Boxes (AABBs) are rectangles that frame a shape.
+Their X-Axis and Y-Axis orientation makes it easy to test two AABBs for overlap.</p></div>
+      <dl class="paramcmts block"><dt class="param">minVertex</dt><dd class="cmt"><p>Position vector of the bottom-left vertex</p></dd><dt class="param">maxVertex</dt><dd class="cmt"><p>Position vector of the upper-right vertex</p></dd></dl>
       
-
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="overlaps%28sims.collision.AABB%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>overlaps</em>(<em>box</em> : <a href="../../sims/collision/AABB.html" target="_self">AABB</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Checks this AABB with <code>box</code> for overlap.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>box - </code>AABB with which to check for overlap</dd></dl>
-    <hr></hr>
-<a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+      
+      <div class="block">
+                known subclasses: <a href="../../graphyx/graphics/GraphicalAABB.html">GraphicalAABB</a>
+              </div>
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.collision.AABB#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.AABB#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.AABB#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.AABB#maxVertex">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">maxVertex</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.AABB#minVertex">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">minVertex</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.AABB#overlaps">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">overlaps</span><span class="params">(<span name="box">box: <a href="" class="extype" name="sims.collision.AABB">AABB</a></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Checks this AABB with <code>box</code> for overlap</p><div class="fullcomment">
+      <div class="comment cmt"><p>Checks this AABB with <code>box</code> for overlap.</p></div>
+      <dl class="paramcmts block"><dt class="param">box</dt><dd class="cmt"><p>AABB with which to check for overlap</p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.AABB#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.AABB#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.AABB#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.AABB#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.collision.AABB#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">AABB</span><span class="params">(<span name="minVertex">minVertex: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="maxVertex">maxVertex: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">AABB</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/collision/CircleCollision$object.html b/doc/sims/collision/CircleCollision$object.html
deleted file mode 100644
index c175c15..0000000
--- a/doc/sims/collision/CircleCollision$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object CircleCollision in sims.collision</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/collision$package.html" target="_self">sims.collision</a>
-        <br></br>
-        <span class="entity">object  CircleCollision</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/collision/CircleCollision"><code>sims/collision/CircleCollision.scala</code></a>]
-      </div><hr></hr>
-      <a name="CircleCollision"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>CircleCollision</em>
-      </dt>
-      <dd><code> extends </code>(<a href="../../sims/dynamics/Circle.html" target="_self">Circle</a>, <a href="../../sims/dynamics/Circle.html" target="_self">Circle</a>) =&gt; <a href="../../sims/collision/CircleCollision.html" target="_self">CircleCollision</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function2">scala.Function2</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function2">scala.Function2.toString</a>, <a href="#curry" target="contentFrame" class="scala/Function2">scala.Function2.curry</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/collision/CircleCollision.html b/doc/sims/collision/CircleCollision.html
index e26027f..80e6b4d 100644
--- a/doc/sims/collision/CircleCollision.html
+++ b/doc/sims/collision/CircleCollision.html
@@ -1,409 +1,321 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class CircleCollision in sims.collision</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/collision$package.html" target="_self">sims.collision</a>
-        <br></br>
-        <span class="entity">class  CircleCollision</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/collision/CircleCollision"><code>sims/collision/CircleCollision.scala</code></a>]
-      </div><hr></hr>
-      <a name="CircleCollision"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>CircleCollision</em>(<code>val </code><em>c1</em> : <a href="../../sims/dynamics/Circle.html" target="_self">Circle</a>, <code>val </code><em>c2</em> : <a href="../../sims/dynamics/Circle.html" target="_self">Circle</a>)
-      </dt>
-      <dd><code> extends </code><a href="../../sims/collision/Collision.html" target="_self">Collision</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
-      <dl><dd>Collision between two circles.</dd></dl>
-      <dl></dl>
+        <head>
+          <title>Scaladoc for sims.collision.CircleCollision</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
     
+        </head>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">collision</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/CircleCollision.html#normal" target="_self">normal</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Normal vector to the collision face.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/CircleCollision.html#points" target="_self">points</a></em>
-         : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]
-        
-        <div>Collision points.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/CircleCollision.html#shape1" target="_self">shape1</a></em>
-         : <a href="../../sims/dynamics/Circle.html" target="_self">Circle</a>
-        
-        <div>First colliding shape (reference shape).</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/CircleCollision.html#shape2" target="_self">shape2</a></em>
-         : <a href="../../sims/dynamics/Circle.html" target="_self">Circle</a>
-        
-        <div>Second colliding shape (incident shape).</div>
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/CircleCollision.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/CircleCollision.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/CircleCollision.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/CircleCollision.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/CircleCollision.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/CircleCollision.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../sims/collision/Collision.html" target="_self">Collision</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/collision/Collision.html#correctVelocity%28Double%29" target="_self">correctVelocity</a>, <a href="../../sims/collision/Collision.html#correctFriction%28sims.geometry.Vector2D%2CDouble%2CDouble%29" target="_self">correctFriction</a>, <a href="../../sims/collision/Collision.html#correctPosition%28Double%29" target="_self">correctPosition</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>CircleCollision</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">CircleCollision</span><span class="params">(<span name="c1">c1: <a href="../dynamics/Circle.html" class="extype" name="sims.dynamics.Circle">Circle</a></span>, <span name="c2">c2: <a href="../dynamics/Circle.html" class="extype" name="sims.dynamics.Circle">Circle</a></span>)</span><span class="result"> extends <a href="Collision.html" class="extype" name="sims.collision.Collision">Collision</a> with <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>Collision between two circles.</p></div>
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="shape1"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>shape1</em> : <a href="../../sims/dynamics/Circle.html" target="_self">Circle</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>First colliding shape (reference shape).</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/collision/Collision.html" target="_self">Collision</a>.<a href="../../sims/collision/Collision.html#shape1" target="_self">shape1</a>
-        </dd>
-      </dl><hr></hr>
-<a name="shape2"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>shape2</em> : <a href="../../sims/dynamics/Circle.html" target="_self">Circle</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Second colliding shape (incident shape).</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/collision/Collision.html" target="_self">Collision</a>.<a href="../../sims/collision/Collision.html#shape2" target="_self">shape2</a>
-        </dd>
-      </dl><hr></hr>
-<a name="normal"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>normal</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Normal vector to the collision face.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/collision/Collision.html" target="_self">Collision</a>.<a href="../../sims/collision/Collision.html#normal" target="_self">normal</a>
-        </dd>
-      </dl><hr></hr>
-<a name="points"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>points</em> : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Collision points.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/collision/Collision.html" target="_self">Collision</a>.<a href="../../sims/collision/Collision.html#points" target="_self">points</a>
-        </dd>
-      </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="sims.collision.Collision">Collision</li><li class="in" name="sims.dynamics.Constraint">Constraint</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.collision.CircleCollision#c1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">c1</span><span class="result">: <a href="../dynamics/Circle.html" class="extype" name="sims.dynamics.Circle">Circle</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.CircleCollision#c2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">c2</span><span class="result">: <a href="../dynamics/Circle.html" class="extype" name="sims.dynamics.Circle">Circle</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.CircleCollision#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.Collision#correctFriction">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctFriction</span><span class="params">(<span name="point">point: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="normalForce">normalForce: <span class="extype" name="scala.Double">Double</span></span>, <span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.Collision#correctPosition">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctPosition</span><span class="params">(<span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Corrects the positions of bodies according to this constraint</p><div class="fullcomment">
+      <div class="comment cmt"><p>Corrects the positions of bodies according to this constraint.</p></div>
+      <dl class="paramcmts block"><dt class="param">h</dt><dd class="cmt"><p>a time interval, used for converting forces and impulses</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Collision.html">Collision</a> ⇐ <a href="../dynamics/Constraint.html">Constraint</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.collision.Collision#correctVelocity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctVelocity</span><span class="params">(<span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Corrects the velocities of bodies according to this constraint</p><div class="fullcomment">
+      <div class="comment cmt"><p>Corrects the velocities of bodies according to this constraint.</p></div>
+      <dl class="paramcmts block"><dt class="param">h</dt><dd class="cmt"><p>a time interval, used for converting forces and impulses</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Collision.html">Collision</a> ⇐ <a href="../dynamics/Constraint.html">Constraint</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.collision.CircleCollision#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.CircleCollision#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.CircleCollision#normal">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">normal</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Normal vector to the collision face</p><div class="fullcomment">
+      <div class="comment cmt"><p>Normal vector to the collision face.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.CircleCollision#points">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">points</span><span class="result">: <span class="extype" name="scala.collection.immutable.List">List</span>[<a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Collision points</p><div class="fullcomment">
+      <div class="comment cmt"><p>Collision points.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.CircleCollision#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.CircleCollision#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.CircleCollision#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.CircleCollision#shape1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">shape1</span><span class="result">: <a href="../dynamics/Circle.html" class="extype" name="sims.dynamics.Circle">Circle</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">First colliding shape (reference shape)</p><div class="fullcomment">
+      <div class="comment cmt"><p>First colliding shape (reference shape).</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.CircleCollision#shape2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">shape2</span><span class="result">: <a href="../dynamics/Circle.html" class="extype" name="sims.dynamics.Circle">Circle</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Second colliding shape (incident shape)</p><div class="fullcomment">
+      <div class="comment cmt"><p>Second colliding shape (incident shape).</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.CircleCollision#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.collision.CircleCollision#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">CircleCollision</span><span class="params">(<span name="c1">c1: <a href="../dynamics/Circle.html" class="extype" name="sims.dynamics.Circle">Circle</a></span>, <span name="c2">c2: <a href="../dynamics/Circle.html" class="extype" name="sims.dynamics.Circle">Circle</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.Collision#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">CircleCollision</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/collision/Collision$.html b/doc/sims/collision/Collision$.html
new file mode 100644
index 0000000..a7c64d8
--- /dev/null
+++ b/doc/sims/collision/Collision$.html
@@ -0,0 +1,162 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for sims.collision.Collision</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">collision</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>Collision</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Collision</span><span class="result"> extends AnyRef</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.collision.Collision#ToleratedOverlap">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">ToleratedOverlap</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Tolerated overlap</p><div class="fullcomment">
+      <div class="comment cmt"><p>Tolerated overlap. Collision response will only be applied if the overlap of two shapes exceeds the tolerated overlap.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/sims/collision/Collision$object.html b/doc/sims/collision/Collision$object.html
deleted file mode 100644
index 0d02762..0000000
--- a/doc/sims/collision/Collision$object.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Collision in sims.collision</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/collision$package.html" target="_self">sims.collision</a>
-        <br></br>
-        <span class="entity">object  Collision</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/collision/Collision"><code>sims/collision/Collision.scala</code></a>]
-      </div><hr></hr>
-      <a name="Collision"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Collision</em>
-      </dt>
-      <dd><code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a></dd>
-    </dl>
-      
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/Collision$object.html#ToleratedOverlap" target="_self">ToleratedOverlap</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Tolerated overlap. Collision response will only be applied if the overlap of two shapes exceeds the tolerated overlap.</div>
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="ToleratedOverlap"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>ToleratedOverlap</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Tolerated overlap. Collision response will only be applied if the overlap of two shapes exceeds the tolerated overlap.</dd></dl>
-      <dl></dl>
-    <hr></hr></div>
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/collision/Collision.html b/doc/sims/collision/Collision.html
index 028dc09..c74223c 100644
--- a/doc/sims/collision/Collision.html
+++ b/doc/sims/collision/Collision.html
@@ -1,261 +1,263 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class Collision in sims.collision</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for sims.collision.Collision</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/collision$package.html" target="_self">sims.collision</a>
-        <br></br>
-        <span class="entity">class  Collision</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/collision/Collision"><code>sims/collision/Collision.scala</code></a>]
-      </div><hr></hr>
-      <a name="Collision"></a><dl>
-      <dt>
-        
-        <code>abstract</code>
-        <code>class</code>
-        <em>Collision</em>
-      </dt>
-      <dd><code> extends </code><a href="../../sims/dynamics/Constraint.html" target="_self">Constraint</a><code> with </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a></dd>
-    </dl>
-      <dl><dd>Collision between two shapes. Contains methods to compute the collision response.</dd></dl>
-      <dl></dl>
-    <dl>
-      <dt style="margin:10px 0 0 20px;"><b>Direct Known Subclasses:</b></dt>
-      <dd><a href="../../sims/collision/CircleCollision.html" target="_self">CircleCollision</a>, <a href="../../sims/collision/PolyCircleCollision.html" target="_self">PolyCircleCollision</a>, <a href="../../sims/collision/PolyCollision.html" target="_self">PolyCollision</a></dd>
-      </dl><hr></hr>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">collision</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/Collision.html#normal" target="_self">normal</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Normal vector to the collision face.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/Collision.html#points" target="_self">points</a></em>
-         : <a href="" target="contentFrame" class="scala/Iterable">scala.Iterable</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]
-        
-        <div>Collision points.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/Collision.html#shape1" target="_self">shape1</a></em>
-         : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>
-        
-        <div>First colliding shape (reference shape).</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/Collision.html#shape2" target="_self">shape2</a></em>
-         : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>
-        
-        <div>Second colliding shape (incident shape).</div>
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/Collision.html#correctFriction%28sims.geometry.Vector2D%2CDouble%2CDouble%29" target="_self">correctFriction</a></em>
-        (<em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <em>normalForce</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/Collision.html#correctPosition%28Double%29" target="_self">correctPosition</a></em>
-        (<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Corrects the positions of bodies according to this constraint.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/Collision.html#correctVelocity%28Double%29" target="_self">correctVelocity</a></em>
-        (<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Corrects the velocities of bodies according to this constraint.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>Collision</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Collision</span><span class="result"> extends <a href="../dynamics/Constraint.html" class="extype" name="sims.dynamics.Constraint">Constraint</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>Collision between two shapes. Contains methods to compute the collision response.</p></div>
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="shape1"></a><dl>
-      <dt>
-        
-        <code>abstract</code>
-        <code>val</code>
-        <em>shape1</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>First colliding shape (reference shape).</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="shape2"></a><dl>
-      <dt>
-        
-        <code>abstract</code>
-        <code>val</code>
-        <em>shape2</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Second colliding shape (incident shape).</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="points"></a><dl>
-      <dt>
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      <div class="block">
+                known subclasses: <a href="PolyCollision.html">PolyCollision</a>, <a href="PolyCircleCollision.html">PolyCircleCollision</a>, <a href="CircleCollision.html">CircleCollision</a>
+              </div>
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="sims.dynamics.Constraint">Constraint</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code>abstract</code>
-        <code>val</code>
-        <em>points</em> : <a href="" target="contentFrame" class="scala/Iterable">scala.Iterable</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Collision points.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="normal"></a><dl>
-      <dt>
         
-        <code>abstract</code>
-        <code>val</code>
-        <em>normal</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Normal vector to the collision face.</dd></dl>
-      <dl></dl>
-    <hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="correctVelocity%28Double%29"></a><dl>
-      <dt>
         
-        <code></code>
-        <code>def</code>
-        <em>correctVelocity</em>(<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Corrects the velocities of bodies according to this constraint.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>h - </code>a time interval, used for converting forces and impulses</dd></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/Constraint.html" target="_self">Constraint</a>.<a href="../../sims/dynamics/Constraint.html#correctVelocity%28Double%29" target="_self">correctVelocity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="correctFriction%28sims.geometry.Vector2D%2CDouble%2CDouble%29"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.collision.Collision#correctFriction">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctFriction</span><span class="params">(<span name="point">point: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="normalForce">normalForce: <span class="extype" name="scala.Double">Double</span></span>, <span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.Collision#correctPosition">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctPosition</span><span class="params">(<span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Corrects the positions of bodies according to this constraint</p><div class="fullcomment">
+      <div class="comment cmt"><p>Corrects the positions of bodies according to this constraint.</p></div>
+      <dl class="paramcmts block"><dt class="param">h</dt><dd class="cmt"><p>a time interval, used for converting forces and impulses</p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.Collision#correctVelocity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctVelocity</span><span class="params">(<span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Corrects the velocities of bodies according to this constraint</p><div class="fullcomment">
+      <div class="comment cmt"><p>Corrects the velocities of bodies according to this constraint.</p></div>
+      <dl class="paramcmts block"><dt class="param">h</dt><dd class="cmt"><p>a time interval, used for converting forces and impulses</p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.collision.Collision#normal">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">normal</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Normal vector to the collision face</p><div class="fullcomment">
+      <div class="comment cmt"><p>Normal vector to the collision face.</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      
+    </div>
+    </li><li name="sims.collision.Collision#points">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">points</span><span class="result">: <span class="extype" name="scala.collection.Iterable">Iterable</span>[<a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Collision points</p><div class="fullcomment">
+      <div class="comment cmt"><p>Collision points.</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      
+    </div>
+    </li><li name="sims.collision.Collision#shape1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">shape1</span><span class="result">: <a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">First colliding shape (reference shape)</p><div class="fullcomment">
+      <div class="comment cmt"><p>First colliding shape (reference shape).</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      
+    </div>
+    </li><li name="sims.collision.Collision#shape2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">shape2</span><span class="result">: <a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Second colliding shape (incident shape)</p><div class="fullcomment">
+      <div class="comment cmt"><p>Second colliding shape (incident shape).</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>correctFriction</em>(<em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <em>normalForce</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="correctPosition%28Double%29"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.collision.Collision#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Collision</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>correctPosition</em>(<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Corrects the positions of bodies according to this constraint.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>h - </code>a time interval, used for converting forces and impulses</dd></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/Constraint.html" target="_self">Constraint</a>.<a href="../../sims/dynamics/Constraint.html#correctPosition%28Double%29" target="_self">correctPosition</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/collision/Detector.html b/doc/sims/collision/Detector.html
index ad93c73..c858df8 100644
--- a/doc/sims/collision/Detector.html
+++ b/doc/sims/collision/Detector.html
@@ -1,133 +1,195 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class Detector in sims.collision</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for sims.collision.Detector</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/collision$package.html" target="_self">sims.collision</a>
-        <br></br>
-        <span class="entity">class  Detector</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/collision/Detector"><code>sims/collision/Detector.scala</code></a>]
-      </div><hr></hr>
-      <a name="Detector"></a><dl>
-      <dt>
-        
-        <code>abstract</code>
-        <code>class</code>
-        <em>Detector</em>
-      </dt>
-      <dd><code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a></dd>
-    </dl>
-      <dl><dd>A world detects its collisions through concrete implementations of this class.</dd></dl>
-      <dl></dl>
-    <dl>
-      <dt style="margin:10px 0 0 20px;"><b>Direct Known Subclasses:</b></dt>
-      <dd><a href="../../sims/collision/GridDetector.html" target="_self">GridDetector</a></dd>
-      </dl><hr></hr>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">collision</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/Detector.html#world" target="_self">world</a></em>
-         : <a href="../../sims/dynamics/World.html" target="_self">World</a>
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>Detector</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Detector</span><span class="result"> extends AnyRef</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>A world detects its collisions through concrete implementations of this class.</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      <div class="block">
+                known subclasses: <a href="GridDetector.html">GridDetector</a>
+              </div>
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <div>The world whose shapes are to be checked for collisions.</div>
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/Detector.html#collisions" target="_self">collisions</a></em>
-         : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../sims/collision/Collision.html" target="_self">Collision</a>]
         
-        <div>Returns all collisions between shapes in the world <code>world</code>.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.collision.Detector#collisions">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">collisions</span><span class="result">: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="Collision.html" class="extype" name="sims.collision.Collision">Collision</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns all collisions between shapes in the world <code>world</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns all collisions between shapes in the world <code>world</code>.</p></div>
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="world"></a><dl>
-      <dt>
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.collision.Detector#world">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">world</span><span class="result">: <a href="../dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">The world whose shapes are to be checked for collisions</p><div class="fullcomment">
+      <div class="comment cmt"><p>The world whose shapes are to be checked for collisions.</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code>abstract</code>
-        <code>val</code>
-        <em>world</em> : <a href="../../sims/dynamics/World.html" target="_self">World</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>The world whose shapes are to be checked for collisions.</dd></dl>
-      <dl></dl>
-    <hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="collisions"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.collision.Detector#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Detector</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>abstract</code>
-        <code>def</code>
-        <em>collisions</em> : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../sims/collision/Collision.html" target="_self">Collision</a>]
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns all collisions between shapes in the world <code>world</code>.</dd></dl>
-      <dl></dl>
-    <hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/collision/GridDetector.html b/doc/sims/collision/GridDetector.html
index 9007d31..6cdaad7 100644
--- a/doc/sims/collision/GridDetector.html
+++ b/doc/sims/collision/GridDetector.html
@@ -1,311 +1,317 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class GridDetector in sims.collision</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/collision$package.html" target="_self">sims.collision</a>
-        <br></br>
-        <span class="entity">class  GridDetector</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/collision/GridDetector"><code>sims/collision/GridDetector.scala</code></a>]
-      </div><hr></hr>
-      <a name="GridDetector"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>class</code>
-        <em>GridDetector</em>(<code>val override </code><em>world</em> : <a href="../../sims/dynamics/World.html" target="_self">World</a>)
-      </dt>
-      <dd><code> extends </code><a href="../../sims/collision/Detector.html" target="_self">Detector</a></dd>
-    </dl>
-      <dl><dd>A conrete implementation of <code>Detector</code>. <code>GridDetector</code> divides the world into a grid
- for faster collision detection.</dd></dl>
-      <dl></dl>
+        <head>
+          <title>Scaladoc for sims.collision.GridDetector</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
     
+        </head>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">collision</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/GridDetector.html#collisionMethods" target="_self">collisionMethods</a></em>
-         : <a href="" target="contentFrame" class="scala/collection/mutable/ArrayBuffer">scala.collection.mutable.ArrayBuffer</a>[<a href="" target="contentFrame" class="scala/PartialFunction">scala.PartialFunction</a>[(<a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>, <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>), <a href="../../sims/collision/Collision.html" target="_self">Collision</a>]]
-        
-        <div>Array of methods returning collisions. It is assumed that both shapes are colliding.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/GridDetector.html#detectionMethods" target="_self">detectionMethods</a></em>
-         : <a href="" target="contentFrame" class="scala/collection/mutable/ArrayBuffer">scala.collection.mutable.ArrayBuffer</a>[<a href="" target="contentFrame" class="scala/PartialFunction">scala.PartialFunction</a>[(<a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>, <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>), <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>]]
-        
-        <div>Array of collision detection methods. These methods return <code>true</code> if two shapes are colliding.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/GridDetector.html#gridSide" target="_self">gridSide</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Width and height of a grid cell.</div>
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/GridDetector.html#colliding%28sims.collision.Pair%29" target="_self">colliding</a></em>
-        (<em>p</em> : <a href="../../sims/collision/Pair.html" target="_self">Pair</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>Checks the pair of shapes <code>p</code> for collision.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/GridDetector.html#collidingPairs" target="_self">collidingPairs</a></em>
-         : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../sims/collision/Pair.html" target="_self">Pair</a>]
-        
-        <div>Returns all colliding pairs.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/GridDetector.html#collision%28sims.collision.Pair%29" target="_self">collision</a></em>
-        (<em>p</em> : <a href="../../sims/collision/Pair.html" target="_self">Pair</a>) : <a href="../../sims/collision/Collision.html" target="_self">Collision</a>
-        
-        <div>Returns the collision between both shapes of the pair <code>p</code>.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/GridDetector.html#collisions" target="_self">collisions</a></em>
-         : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../sims/collision/Collision.html" target="_self">Collision</a>]
-        
-        <div>Returns all collisions.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/GridDetector.html#getPairs" target="_self">getPairs</a></em>
-         : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../sims/collision/Pair.html" target="_self">Pair</a>]
-        
-        <div>Returns potential colliding pairs of shapes of the world <code>world</code>.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/GridDetector.html#pairs" target="_self">pairs</a></em>
-         : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../sims/collision/Pair.html" target="_self">Pair</a>]
-        
-        <div>All potential colliding pairs of the world.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>GridDetector</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GridDetector</span><span class="result"> extends <a href="Detector.html" class="extype" name="sims.collision.Detector">Detector</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>A conrete implementation of <code>Detector</code>. <code>GridDetector</code> divides the world into a grid
+for faster collision detection.</p></div>
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="detectionMethods"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>detectionMethods</em> : <a href="" target="contentFrame" class="scala/collection/mutable/ArrayBuffer">scala.collection.mutable.ArrayBuffer</a>[<a href="" target="contentFrame" class="scala/PartialFunction">scala.PartialFunction</a>[(<a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>, <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>), <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>]]
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Array of collision detection methods. These methods return <code>true</code> if two shapes are colliding.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="collisionMethods"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>collisionMethods</em> : <a href="" target="contentFrame" class="scala/collection/mutable/ArrayBuffer">scala.collection.mutable.ArrayBuffer</a>[<a href="" target="contentFrame" class="scala/PartialFunction">scala.PartialFunction</a>[(<a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>, <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>), <a href="../../sims/collision/Collision.html" target="_self">Collision</a>]]
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Array of methods returning collisions. It is assumed that both shapes are colliding.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="gridSide"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>gridSide</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Width and height of a grid cell.</dd></dl>
-      <dl></dl>
-    <hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="colliding%28sims.collision.Pair%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>colliding</em>(<em>p</em> : <a href="../../sims/collision/Pair.html" target="_self">Pair</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Checks the pair of shapes <code>p</code> for collision.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>p - </code>Pair of shapes.</dd></dl>
-    <hr></hr>
-<a name="collision%28sims.collision.Pair%29"></a><dl>
-      <dt>
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="sims.collision.Detector">Detector</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>collision</em>(<em>p</em> : <a href="../../sims/collision/Pair.html" target="_self">Pair</a>) : <a href="../../sims/collision/Collision.html" target="_self">Collision</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns the collision between both shapes of the pair <code>p</code>.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>p - </code>Pair of shapes.</dd></dl>
-    <hr></hr>
-<a name="getPairs"></a><dl>
-      <dt>
         
-        <code></code>
-        <code>def</code>
-        <em>getPairs</em> : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../sims/collision/Pair.html" target="_self">Pair</a>]
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns potential colliding pairs of shapes of the world <code>world</code>.
-   <p>
-   A potential colliding pair is a pair of two shapes that comply with the following criteria:
-   <ul>
-   <li>The shapes are situated in the same grid cell.</li>
-   <li>Their AABBs overlap.</li>
-   <li>The shapes do not belong to the same body.</li>
-   <li>At least one shape is not fixed.</li>
-   <li>Both shapes are {@link dynamics.Shape#collidable}.</li>
-   </ul></dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="pairs"></a><dl>
-      <dt>
         
-        <code></code>
-        <code>def</code>
-        <em>pairs</em> : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../sims/collision/Pair.html" target="_self">Pair</a>]
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>All potential colliding pairs of the world.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>See Also</b></dt><dd>getPairs</dd></dl>
-    <hr></hr>
-<a name="collidingPairs"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.collision.GridDetector#colliding">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">colliding</span><span class="params">(<span name="p">p: <a href="Pair.html" class="extype" name="sims.collision.Pair">Pair</a></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Checks the pair of shapes <code>p</code> for collision</p><div class="fullcomment">
+      <div class="comment cmt"><p>Checks the pair of shapes <code>p</code> for collision.</p></div>
+      <dl class="paramcmts block"><dt class="param">p</dt><dd class="cmt"><p>Pair of shapes.</p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.GridDetector#collidingPairs">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">collidingPairs</span><span class="result">: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="Pair.html" class="extype" name="sims.collision.Pair">Pair</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns all colliding pairs</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns all colliding pairs.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.GridDetector#collision">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">collision</span><span class="params">(<span name="p">p: <a href="Pair.html" class="extype" name="sims.collision.Pair">Pair</a></span>)</span><span class="result">: <a href="Collision.html" class="extype" name="sims.collision.Collision">Collision</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the collision between both shapes of the pair <code>p</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the collision between both shapes of the pair <code>p</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">p</dt><dd class="cmt"><p>Pair of shapes.</p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.GridDetector#collisionMethods">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">collisionMethods</span><span class="result">: <span class="extype" name="scala.collection.mutable.ArrayBuffer">ArrayBuffer</span>[<span class="extype" name="scala.PartialFunction">PartialFunction</span>[(<a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a>, <a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a>), <a href="Collision.html" class="extype" name="sims.collision.Collision">Collision</a>]]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Array of methods returning collisions</p><div class="fullcomment">
+      <div class="comment cmt"><p>Array of methods returning collisions. It is assumed that both shapes are colliding.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.GridDetector#collisions">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">collisions</span><span class="result">: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="Collision.html" class="extype" name="sims.collision.Collision">Collision</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns all collisions</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns all collisions.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.GridDetector#detectionMethods">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">detectionMethods</span><span class="result">: <span class="extype" name="scala.collection.mutable.ArrayBuffer">ArrayBuffer</span>[<span class="extype" name="scala.PartialFunction">PartialFunction</span>[(<a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a>, <a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a>), <span class="extype" name="scala.Boolean">Boolean</span>]]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Array of collision detection methods</p><div class="fullcomment">
+      <div class="comment cmt"><p>Array of collision detection methods. These methods return <code>true</code> if two shapes are colliding.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.collision.GridDetector#getPairs">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">getPairs</span><span class="result">: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="Pair.html" class="extype" name="sims.collision.Pair">Pair</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns potential colliding pairs of shapes of the world <code>world</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns potential colliding pairs of shapes of the world <code>world</code>.
+<p>
+A potential colliding pair is a pair of two shapes that comply with the following criteria:
+<ul>
+<li>The shapes are situated in the same grid cell.</li>
+<li>Their AABBs overlap.</li>
+<li>The shapes do not belong to the same body.</li>
+<li>At least one shape is not fixed.</li>
+<li>Both shapes are {@link dynamics.Shape#collidable}.</li>
+</ul></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.GridDetector#gridSide">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">gridSide</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Width and height of a grid cell</p><div class="fullcomment">
+      <div class="comment cmt"><p>Width and height of a grid cell.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.collision.GridDetector#pairs">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">pairs</span><span class="result">: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="Pair.html" class="extype" name="sims.collision.Pair">Pair</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">All potential colliding pairs of the world</p><div class="fullcomment">
+      <div class="comment cmt"><p>All potential colliding pairs of the world.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.collision.GridDetector#world">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">world</span><span class="result">: <a href="../dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">The world whose shapes are to be checked for collisions</p><div class="fullcomment">
+      <div class="comment cmt"><p>The world whose shapes are to be checked for collisions.</p></div>
+      
+      
+      
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>collidingPairs</em> : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../sims/collision/Pair.html" target="_self">Pair</a>]
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns all colliding pairs.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="collisions"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.collision.GridDetector#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GridDetector</span><span class="params">(<span name="world">world: <a href="../dynamics/World.html" class="extype" name="sims.dynamics.World">World</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.Detector#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">GridDetector</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>collisions</em> : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../sims/collision/Collision.html" target="_self">Collision</a>]
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns all collisions.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/collision/Detector.html" target="_self">Detector</a>.<a href="../../sims/collision/Detector.html#collisions" target="_self">collisions</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/collision/Overlap$object.html b/doc/sims/collision/Overlap$object.html
deleted file mode 100644
index 0989c48..0000000
--- a/doc/sims/collision/Overlap$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Overlap in sims.collision</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/collision$package.html" target="_self">sims.collision</a>
-        <br></br>
-        <span class="entity">object  Overlap</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/collision/Overlap"><code>sims/collision/Overlap.scala</code></a>]
-      </div><hr></hr>
-      <a name="Overlap"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Overlap</em>
-      </dt>
-      <dd><code> extends </code>(<a href="../../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) =&gt; <a href="../../sims/collision/Overlap.html" target="_self">Overlap</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function3">scala.Function3</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function3">scala.Function3.toString</a>, <a href="#curry" target="contentFrame" class="scala/Function3">scala.Function3.curry</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/collision/Overlap.html b/doc/sims/collision/Overlap.html
index f76df7e..b6f9960 100644
--- a/doc/sims/collision/Overlap.html
+++ b/doc/sims/collision/Overlap.html
@@ -1,276 +1,233 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class Overlap in sims.collision</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for sims.collision.Overlap</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/collision$package.html" target="_self">sims.collision</a>
-        <br></br>
-        <span class="entity">class  Overlap</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/collision/Overlap"><code>sims/collision/Overlap.scala</code></a>]
-      </div><hr></hr>
-      <a name="Overlap"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>Overlap</em>(<code>val </code><em>poly</em> : <a href="../../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a>, <code>val </code><em>sideNum</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>, <code>val </code><em>overlap</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>)
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">collision</a></p>
 
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>Overlap</h1>
+      </div>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/Overlap.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/Overlap.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/Overlap.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/Overlap.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/Overlap.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/Overlap.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Overlap</span><span class="params">(<span name="poly">poly: <a href="../geometry/ConvexPolygon.html" class="extype" name="sims.geometry.ConvexPolygon">ConvexPolygon</a></span>, <span name="sideNum">sideNum: <span class="extype" name="scala.Int">Int</span></span>, <span name="overlap">overlap: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result"> extends <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.collision.Overlap#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.Overlap#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.Overlap#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.Overlap#overlap">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">overlap</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.Overlap#poly">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">poly</span><span class="result">: <a href="../geometry/ConvexPolygon.html" class="extype" name="sims.geometry.ConvexPolygon">ConvexPolygon</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.Overlap#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.Overlap#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.Overlap#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.Overlap#sideNum">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">sideNum</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.Overlap#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.collision.Overlap#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Overlap</span><span class="params">(<span name="poly">poly: <a href="../geometry/ConvexPolygon.html" class="extype" name="sims.geometry.ConvexPolygon">ConvexPolygon</a></span>, <span name="sideNum">sideNum: <span class="extype" name="scala.Int">Int</span></span>, <span name="overlap">overlap: <span class="extype" name="scala.Double">Double</span></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Overlap</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/collision/Pair$object.html b/doc/sims/collision/Pair$object.html
deleted file mode 100644
index fab5d78..0000000
--- a/doc/sims/collision/Pair$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Pair in sims.collision</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/collision$package.html" target="_self">sims.collision</a>
-        <br></br>
-        <span class="entity">object  Pair</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/collision/Pair"><code>sims/collision/Pair.scala</code></a>]
-      </div><hr></hr>
-      <a name="Pair"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Pair</em>
-      </dt>
-      <dd><code> extends </code>(<a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>, <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>) =&gt; <a href="../../sims/collision/Pair.html" target="_self">Pair</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function2">scala.Function2</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function2">scala.Function2.toString</a>, <a href="#curry" target="contentFrame" class="scala/Function2">scala.Function2.curry</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/collision/Pair.html b/doc/sims/collision/Pair.html
index e210fc9..af5a434 100644
--- a/doc/sims/collision/Pair.html
+++ b/doc/sims/collision/Pair.html
@@ -1,257 +1,274 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class Pair in sims.collision</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/collision$package.html" target="_self">sims.collision</a>
-        <br></br>
-        <span class="entity">class  Pair</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/collision/Pair"><code>sims/collision/Pair.scala</code></a>]
-      </div><hr></hr>
-      <a name="Pair"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>Pair</em>(<code>val </code><em>s1</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>, <code>val </code><em>s2</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>)
-      </dt>
-      <dd><code> extends </code>(<a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>, <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>)</dd>
-    </dl>
-      <dl><dd>Pair of shapes.</dd></dl>
-      <dl></dl>
+        <head>
+          <title>Scaladoc for sims.collision.Pair</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
     
-      <table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Additional Constructor Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/Pair.html#this%28%28sims.dynamics.Shape%2Csims.dynamics.Shape%29%29" target="_self">this</a></em>
-        (<em>t</em> : (<a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>, <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>)) : <a href="../../sims/collision/Pair.html" target="_self">Pair</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="" target="contentFrame" class="scala/Tuple2">scala.Tuple2</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#_1" target="contentFrame" class="scala/Tuple2">scala.Tuple2._1</a>, <a href="#_2" target="contentFrame" class="scala/Tuple2">scala.Tuple2._2</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/Pair.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>other</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/Pair.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/Pair.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Tuple2">scala.Tuple2</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Tuple2">scala.Tuple2.toString</a>, <a href="#swap" target="contentFrame" class="scala/Tuple2">scala.Tuple2.swap</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Product2">scala.Product2</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#productArity" target="contentFrame" class="scala/Product2">scala.Product2.productArity</a>, <a href="#productElement" target="contentFrame" class="scala/Product2">scala.Product2.productElement</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
+        </head>
+        <body class="type">
+      
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">collision</a></p>
 
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>Pair</h1>
+      </div>
 
-      <table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Additional Constructor Details</td></tr>
-        </table><div><a name="this%28%28sims.dynamics.Shape%2Csims.dynamics.Shape%29%29"></a><dl>
-      <dt>
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Pair</span><span class="params">(<span name="s1">s1: <a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>, <span name="s2">s2: <a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>)</span><span class="result"> extends (<a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a>, <a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a>) with <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>Pair of shapes.</p></div>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Tuple2">Tuple2</li><li class="in" name="scala.Product2">Product2</li><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>this</em>(<em>t</em> : (<a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>, <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>)) : <a href="../../sims/collision/Pair.html" target="_self">Pair</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="equals%28Any%29"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>other</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Tuple2">scala.Tuple2</a>.<a href="#equals" target="contentFrame" class="scala/Tuple2">scala.Tuple2.equals</a>
-        </dd>
-      </dl><hr></hr>
-<a name="hashCode%28%29"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Tuple2">scala.Tuple2</a>.<a href="#hashCode" target="contentFrame" class="scala/Tuple2">scala.Tuple2.hashCode</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="scala.Tuple2#_1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">_1</span><span class="result">: <a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Tuple2#_2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">_2</span><span class="result">: <a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.Pair#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.Pair#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="other">other: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.Pair#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="scala.Product2#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product2#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="n">n: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.Pair#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.Pair#s1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">s1</span><span class="result">: <a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.Pair#s2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">s2</span><span class="result">: <a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Tuple2#swap">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">swap</span><span class="result">: (<a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a>, <a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Tuple2#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: Tuple2 ⇐ AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.Tuple2#zip">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">zip</span><span class="tparams">[<span name="Repr1">Repr1</span>, <span name="El1">El1</span>, <span name="El2">El2</span>, <span name="To">To</span>]</span><span class="params">(<span name="w1">w1: (<a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a>) ⇒ <span class="extype" name="scala.collection.TraversableLike">TraversableLike</span>[El1, Repr1]</span>, <span name="w2">w2: (<a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a>) ⇒ <span class="extype" name="scala.collection.Iterable">Iterable</span>[El2]</span>, <span name="cbf1">cbf1: <span class="extype" name="scala.collection.generic.CanBuildFrom">CanBuildFrom</span>[Repr1, (El1, El2), To]</span>)</span><span class="result">: To</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Tuple2#zipped">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">zipped</span><span class="tparams">[<span name="Repr1">Repr1</span>, <span name="El1">El1</span>, <span name="Repr2">Repr2</span>, <span name="El2">El2</span>]</span><span class="params">(<span name="w1">w1: (<a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a>) ⇒ <span class="extype" name="scala.collection.TraversableLike">TraversableLike</span>[El1, Repr1]</span>, <span name="w2">w2: (<a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a>) ⇒ <span class="extype" name="scala.collection.IterableLike">IterableLike</span>[El2, Repr2]</span>)</span><span class="result">: <span class="extype" name="scala.Tuple2.Zipped">Zipped</span>[Repr1, El1, Repr2, El2]</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Tuple2">scala.Tuple2</a>.<a href="#productPrefix" target="contentFrame" class="scala/Tuple2">scala.Tuple2.productPrefix</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.collision.Pair#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Pair</span><span class="params">(<span name="t">t: (<a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a>, <a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a>)</span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.Pair#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Pair</span><span class="params">(<span name="s1">s1: <a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>, <span name="s2">s2: <a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Pair</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/collision/PolyCircleCollision$object.html b/doc/sims/collision/PolyCircleCollision$object.html
deleted file mode 100644
index 7ccdcf3..0000000
--- a/doc/sims/collision/PolyCircleCollision$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object PolyCircleCollision in sims.collision</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/collision$package.html" target="_self">sims.collision</a>
-        <br></br>
-        <span class="entity">object  PolyCircleCollision</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/collision/PolyCircleCollision"><code>sims/collision/PolyCircleCollision.scala</code></a>]
-      </div><hr></hr>
-      <a name="PolyCircleCollision"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>PolyCircleCollision</em>
-      </dt>
-      <dd><code> extends </code>(<a href="../../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a>, <a href="../../sims/dynamics/Circle.html" target="_self">Circle</a>) =&gt; <a href="../../sims/collision/PolyCircleCollision.html" target="_self">PolyCircleCollision</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function2">scala.Function2</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function2">scala.Function2.toString</a>, <a href="#curry" target="contentFrame" class="scala/Function2">scala.Function2.curry</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/collision/PolyCircleCollision.html b/doc/sims/collision/PolyCircleCollision.html
index 3b1d094..fc31ca6 100644
--- a/doc/sims/collision/PolyCircleCollision.html
+++ b/doc/sims/collision/PolyCircleCollision.html
@@ -1,409 +1,321 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class PolyCircleCollision in sims.collision</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/collision$package.html" target="_self">sims.collision</a>
-        <br></br>
-        <span class="entity">class  PolyCircleCollision</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/collision/PolyCircleCollision"><code>sims/collision/PolyCircleCollision.scala</code></a>]
-      </div><hr></hr>
-      <a name="PolyCircleCollision"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>PolyCircleCollision</em>(<code>val </code><em>p</em> : <a href="../../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a>, <code>val </code><em>c</em> : <a href="../../sims/dynamics/Circle.html" target="_self">Circle</a>)
-      </dt>
-      <dd><code> extends </code><a href="../../sims/collision/Collision.html" target="_self">Collision</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
-      <dl><dd>Collision between a convex polygon and a circle.</dd></dl>
-      <dl></dl>
+        <head>
+          <title>Scaladoc for sims.collision.PolyCircleCollision</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
     
+        </head>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">collision</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/PolyCircleCollision.html#normal" target="_self">normal</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Normal vector to the collision face.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/PolyCircleCollision.html#points" target="_self">points</a></em>
-         : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]
-        
-        <div>Collision points.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/PolyCircleCollision.html#shape1" target="_self">shape1</a></em>
-         : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>
-        
-        <div>First colliding shape (reference shape).</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/PolyCircleCollision.html#shape2" target="_self">shape2</a></em>
-         : <a href="../../sims/dynamics/Circle.html" target="_self">Circle</a>
-        
-        <div>Second colliding shape (incident shape).</div>
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/PolyCircleCollision.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/PolyCircleCollision.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/PolyCircleCollision.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/PolyCircleCollision.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/PolyCircleCollision.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/PolyCircleCollision.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../sims/collision/Collision.html" target="_self">Collision</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/collision/Collision.html#correctVelocity%28Double%29" target="_self">correctVelocity</a>, <a href="../../sims/collision/Collision.html#correctFriction%28sims.geometry.Vector2D%2CDouble%2CDouble%29" target="_self">correctFriction</a>, <a href="../../sims/collision/Collision.html#correctPosition%28Double%29" target="_self">correctPosition</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>PolyCircleCollision</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">PolyCircleCollision</span><span class="params">(<span name="p">p: <a href="../geometry/ConvexPolygon.html" class="extype" name="sims.geometry.ConvexPolygon">ConvexPolygon</a></span>, <span name="c">c: <a href="../dynamics/Circle.html" class="extype" name="sims.dynamics.Circle">Circle</a></span>)</span><span class="result"> extends <a href="Collision.html" class="extype" name="sims.collision.Collision">Collision</a> with <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>Collision between a convex polygon and a circle.</p></div>
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="shape1"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>shape1</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>First colliding shape (reference shape).</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/collision/Collision.html" target="_self">Collision</a>.<a href="../../sims/collision/Collision.html#shape1" target="_self">shape1</a>
-        </dd>
-      </dl><hr></hr>
-<a name="shape2"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>shape2</em> : <a href="../../sims/dynamics/Circle.html" target="_self">Circle</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Second colliding shape (incident shape).</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/collision/Collision.html" target="_self">Collision</a>.<a href="../../sims/collision/Collision.html#shape2" target="_self">shape2</a>
-        </dd>
-      </dl><hr></hr>
-<a name="normal"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>normal</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Normal vector to the collision face.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/collision/Collision.html" target="_self">Collision</a>.<a href="../../sims/collision/Collision.html#normal" target="_self">normal</a>
-        </dd>
-      </dl><hr></hr>
-<a name="points"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>points</em> : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Collision points.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/collision/Collision.html" target="_self">Collision</a>.<a href="../../sims/collision/Collision.html#points" target="_self">points</a>
-        </dd>
-      </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="sims.collision.Collision">Collision</li><li class="in" name="sims.dynamics.Constraint">Constraint</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.collision.PolyCircleCollision#c">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">c</span><span class="result">: <a href="../dynamics/Circle.html" class="extype" name="sims.dynamics.Circle">Circle</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.PolyCircleCollision#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.Collision#correctFriction">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctFriction</span><span class="params">(<span name="point">point: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="normalForce">normalForce: <span class="extype" name="scala.Double">Double</span></span>, <span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.Collision#correctPosition">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctPosition</span><span class="params">(<span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Corrects the positions of bodies according to this constraint</p><div class="fullcomment">
+      <div class="comment cmt"><p>Corrects the positions of bodies according to this constraint.</p></div>
+      <dl class="paramcmts block"><dt class="param">h</dt><dd class="cmt"><p>a time interval, used for converting forces and impulses</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Collision.html">Collision</a> ⇐ <a href="../dynamics/Constraint.html">Constraint</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.collision.Collision#correctVelocity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctVelocity</span><span class="params">(<span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Corrects the velocities of bodies according to this constraint</p><div class="fullcomment">
+      <div class="comment cmt"><p>Corrects the velocities of bodies according to this constraint.</p></div>
+      <dl class="paramcmts block"><dt class="param">h</dt><dd class="cmt"><p>a time interval, used for converting forces and impulses</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Collision.html">Collision</a> ⇐ <a href="../dynamics/Constraint.html">Constraint</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.collision.PolyCircleCollision#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.PolyCircleCollision#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.PolyCircleCollision#normal">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">normal</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Normal vector to the collision face</p><div class="fullcomment">
+      <div class="comment cmt"><p>Normal vector to the collision face.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.PolyCircleCollision#p">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">p</span><span class="result">: <a href="../geometry/ConvexPolygon.html" class="extype" name="sims.geometry.ConvexPolygon">ConvexPolygon</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.PolyCircleCollision#points">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">points</span><span class="result">: <span class="extype" name="scala.collection.immutable.List">List</span>[<a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Collision points</p><div class="fullcomment">
+      <div class="comment cmt"><p>Collision points.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.PolyCircleCollision#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.PolyCircleCollision#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.PolyCircleCollision#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.PolyCircleCollision#shape1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">shape1</span><span class="result">: <a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">First colliding shape (reference shape)</p><div class="fullcomment">
+      <div class="comment cmt"><p>First colliding shape (reference shape).</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.PolyCircleCollision#shape2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">shape2</span><span class="result">: <a href="../dynamics/Circle.html" class="extype" name="sims.dynamics.Circle">Circle</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Second colliding shape (incident shape)</p><div class="fullcomment">
+      <div class="comment cmt"><p>Second colliding shape (incident shape).</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.PolyCircleCollision#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.collision.PolyCircleCollision#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">PolyCircleCollision</span><span class="params">(<span name="p">p: <a href="../geometry/ConvexPolygon.html" class="extype" name="sims.geometry.ConvexPolygon">ConvexPolygon</a></span>, <span name="c">c: <a href="../dynamics/Circle.html" class="extype" name="sims.dynamics.Circle">Circle</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.Collision#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">PolyCircleCollision</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/collision/PolyCollision$object.html b/doc/sims/collision/PolyCollision$object.html
deleted file mode 100644
index a9642ae..0000000
--- a/doc/sims/collision/PolyCollision$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object PolyCollision in sims.collision</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/collision$package.html" target="_self">sims.collision</a>
-        <br></br>
-        <span class="entity">object  PolyCollision</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/collision/PolyCollision"><code>sims/collision/PolyCollision.scala</code></a>]
-      </div><hr></hr>
-      <a name="PolyCollision"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>PolyCollision</em>
-      </dt>
-      <dd><code> extends </code>(<a href="../../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a>, <a href="../../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a>) =&gt; <a href="../../sims/collision/PolyCollision.html" target="_self">PolyCollision</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function2">scala.Function2</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function2">scala.Function2.toString</a>, <a href="#curry" target="contentFrame" class="scala/Function2">scala.Function2.curry</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/collision/PolyCollision.html b/doc/sims/collision/PolyCollision.html
index 9009f39..8a9cc89 100644
--- a/doc/sims/collision/PolyCollision.html
+++ b/doc/sims/collision/PolyCollision.html
@@ -1,469 +1,345 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class PolyCollision in sims.collision</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/collision$package.html" target="_self">sims.collision</a>
-        <br></br>
-        <span class="entity">class  PolyCollision</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/collision/PolyCollision"><code>sims/collision/PolyCollision.scala</code></a>]
-      </div><hr></hr>
-      <a name="PolyCollision"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>PolyCollision</em>(<code>val </code><em>p1</em> : <a href="../../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a>, <code>val </code><em>p2</em> : <a href="../../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a>)
-      </dt>
-      <dd><code> extends </code><a href="../../sims/collision/Collision.html" target="_self">Collision</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
-      <dl><dd>Collision between two convex polygons.</dd></dl>
-      <dl></dl>
+        <head>
+          <title>Scaladoc for sims.collision.PolyCollision</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
     
+        </head>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">collision</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/PolyCollision.html#minOverlap" target="_self">minOverlap</a></em>
-         : <a href="../../sims/collision/Overlap.html" target="_self">Overlap</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> lazy val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/PolyCollision.html#normal" target="_self">normal</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Normal vector to the collision face.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> lazy val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/PolyCollision.html#overlaps" target="_self">overlaps</a></em>
-         : <a href="" target="contentFrame" class="scala/RandomAccessSeq">scala.RandomAccessSeq</a>[<a href="../../sims/collision/Overlap.html" target="_self">Overlap</a>]
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> lazy val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/PolyCollision.html#points" target="_self">points</a></em>
-         : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]
-        
-        <div>Collision points.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> lazy val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/PolyCollision.html#shape1" target="_self">shape1</a></em>
-         : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>
-        
-        <div>First colliding shape (reference shape).</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> lazy val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/PolyCollision.html#shape2" target="_self">shape2</a></em>
-         : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>
-        
-        <div>Second colliding shape (incident shape).</div>
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/PolyCollision.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/PolyCollision.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/PolyCollision.html#overlap%28sims.geometry.Vector2D%29" target="_self">overlap</a></em>
-        (<em>axis</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/PolyCollision.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/PolyCollision.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/PolyCollision.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/collision/PolyCollision.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../sims/collision/Collision.html" target="_self">Collision</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/collision/Collision.html#correctVelocity%28Double%29" target="_self">correctVelocity</a>, <a href="../../sims/collision/Collision.html#correctFriction%28sims.geometry.Vector2D%2CDouble%2CDouble%29" target="_self">correctFriction</a>, <a href="../../sims/collision/Collision.html#correctPosition%28Double%29" target="_self">correctPosition</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>PolyCollision</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">PolyCollision</span><span class="params">(<span name="p1">p1: <a href="../geometry/ConvexPolygon.html" class="extype" name="sims.geometry.ConvexPolygon">ConvexPolygon</a></span>, <span name="p2">p2: <a href="../geometry/ConvexPolygon.html" class="extype" name="sims.geometry.ConvexPolygon">ConvexPolygon</a></span>)</span><span class="result"> extends <a href="Collision.html" class="extype" name="sims.collision.Collision">Collision</a> with <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>Collision between two convex polygons.</p></div>
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="overlaps"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>lazy val</code>
-        <em>overlaps</em> : <a href="" target="contentFrame" class="scala/RandomAccessSeq">scala.RandomAccessSeq</a>[<a href="../../sims/collision/Overlap.html" target="_self">Overlap</a>]
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="minOverlap"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>minOverlap</em> : <a href="../../sims/collision/Overlap.html" target="_self">Overlap</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="shape1"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>lazy val</code>
-        <em>shape1</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>First colliding shape (reference shape).</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/collision/Collision.html" target="_self">Collision</a>.<a href="../../sims/collision/Collision.html#shape1" target="_self">shape1</a>
-        </dd>
-      </dl><hr></hr>
-<a name="shape2"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>lazy val</code>
-        <em>shape2</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Second colliding shape (incident shape).</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/collision/Collision.html" target="_self">Collision</a>.<a href="../../sims/collision/Collision.html#shape2" target="_self">shape2</a>
-        </dd>
-      </dl><hr></hr>
-<a name="normal"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>lazy val</code>
-        <em>normal</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Normal vector to the collision face.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/collision/Collision.html" target="_self">Collision</a>.<a href="../../sims/collision/Collision.html#normal" target="_self">normal</a>
-        </dd>
-      </dl><hr></hr>
-<a name="points"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>lazy val</code>
-        <em>points</em> : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Collision points.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/collision/Collision.html" target="_self">Collision</a>.<a href="../../sims/collision/Collision.html#points" target="_self">points</a>
-        </dd>
-      </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="overlap%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>overlap</em>(<em>axis</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="sims.collision.Collision">Collision</li><li class="in" name="sims.dynamics.Constraint">Constraint</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.collision.PolyCollision#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.Collision#correctFriction">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctFriction</span><span class="params">(<span name="point">point: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="normalForce">normalForce: <span class="extype" name="scala.Double">Double</span></span>, <span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.Collision#correctPosition">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctPosition</span><span class="params">(<span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Corrects the positions of bodies according to this constraint</p><div class="fullcomment">
+      <div class="comment cmt"><p>Corrects the positions of bodies according to this constraint.</p></div>
+      <dl class="paramcmts block"><dt class="param">h</dt><dd class="cmt"><p>a time interval, used for converting forces and impulses</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Collision.html">Collision</a> ⇐ <a href="../dynamics/Constraint.html">Constraint</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.collision.Collision#correctVelocity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctVelocity</span><span class="params">(<span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Corrects the velocities of bodies according to this constraint</p><div class="fullcomment">
+      <div class="comment cmt"><p>Corrects the velocities of bodies according to this constraint.</p></div>
+      <dl class="paramcmts block"><dt class="param">h</dt><dd class="cmt"><p>a time interval, used for converting forces and impulses</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="Collision.html">Collision</a> ⇐ <a href="../dynamics/Constraint.html">Constraint</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.collision.PolyCollision#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.PolyCollision#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.PolyCollision#minOverlap">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">minOverlap</span><span class="result">: <a href="Overlap.html" class="extype" name="sims.collision.Overlap">Overlap</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.PolyCollision#normal">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">normal</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Normal vector to the collision face</p><div class="fullcomment">
+      <div class="comment cmt"><p>Normal vector to the collision face.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.PolyCollision#overlap">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">overlap</span><span class="params">(<span name="axis">axis: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.PolyCollision#overlaps">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">overlaps</span><span class="result">: <span class="extype" name="scala.collection.immutable.IndexedSeq">IndexedSeq</span>[<a href="Overlap.html" class="extype" name="sims.collision.Overlap">Overlap</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.PolyCollision#p1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">p1</span><span class="result">: <a href="../geometry/ConvexPolygon.html" class="extype" name="sims.geometry.ConvexPolygon">ConvexPolygon</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.PolyCollision#p2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">p2</span><span class="result">: <a href="../geometry/ConvexPolygon.html" class="extype" name="sims.geometry.ConvexPolygon">ConvexPolygon</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.PolyCollision#points">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">points</span><span class="result">: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Collision points</p><div class="fullcomment">
+      <div class="comment cmt"><p>Collision points.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.PolyCollision#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.PolyCollision#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.PolyCollision#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.PolyCollision#shape1">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">shape1</span><span class="result">: <a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">First colliding shape (reference shape)</p><div class="fullcomment">
+      <div class="comment cmt"><p>First colliding shape (reference shape).</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.PolyCollision#shape2">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">shape2</span><span class="result">: <a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Second colliding shape (incident shape)</p><div class="fullcomment">
+      <div class="comment cmt"><p>Second colliding shape (incident shape).</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.collision.PolyCollision#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.collision.PolyCollision#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">PolyCollision</span><span class="params">(<span name="p1">p1: <a href="../geometry/ConvexPolygon.html" class="extype" name="sims.geometry.ConvexPolygon">ConvexPolygon</a></span>, <span name="p2">p2: <a href="../geometry/ConvexPolygon.html" class="extype" name="sims.geometry.ConvexPolygon">ConvexPolygon</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.collision.Collision#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">PolyCollision</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/collision/package.html b/doc/sims/collision/package.html
new file mode 100644
index 0000000..a1e571e
--- /dev/null
+++ b/doc/sims/collision/package.html
@@ -0,0 +1,137 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for sims.collision</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">sims</a></p>
+
+      <div id="definition">
+        <img src="../../lib/package_big.png" />
+        <h1>collision</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">collision</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        
+        
+        <div class="members" id="types">
+              <h3>Type Members</h3>
+              <ol><li name="sims.collision.AABB">
+      <h4 class="signature"><a href="AABB.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">AABB</span><span class="params">(<span name="minVertex">minVertex: Vector2D</span>, <span name="maxVertex">maxVertex: Vector2D</span>)</span><span class="result"> extends Product</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">Axis Aligned Bounding Boxes (AABBs) are rectangles that frame a shape</p>
+    </li><li name="sims.collision.CircleCollision">
+      <h4 class="signature"><a href="CircleCollision.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">CircleCollision</span><span class="params">(<span name="c1">c1: Circle</span>, <span name="c2">c2: Circle</span>)</span><span class="result"> extends Collision with Product</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">Collision between two circles</p>
+    </li><li name="sims.collision.Collision">
+      <h4 class="signature"><a href="Collision.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Collision</span><span class="result"> extends Constraint</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">Collision between two shapes</p>
+    </li><li name="sims.collision.Detector">
+      <h4 class="signature"><a href="Detector.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Detector</span><span class="result"> extends AnyRef</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">A world detects its collisions through concrete implementations of this class</p>
+    </li><li name="sims.collision.GridDetector">
+      <h4 class="signature"><a href="GridDetector.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">GridDetector</span><span class="result"> extends Detector</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">A conrete implementation of <code>Detector</code></p>
+    </li><li name="sims.collision.Overlap">
+      <h4 class="signature"><a href="Overlap.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Overlap</span><span class="params">(<span name="poly">poly: ConvexPolygon</span>, <span name="sideNum">sideNum: Int</span>, <span name="overlap">overlap: Double</span>)</span><span class="result"> extends Product</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="sims.collision.Pair">
+      <h4 class="signature"><a href="Pair.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Pair</span><span class="params">(<span name="s1">s1: Shape</span>, <span name="s2">s2: Shape</span>)</span><span class="result"> extends (Shape, Shape) with Product</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">Pair of shapes</p>
+    </li><li name="sims.collision.PolyCircleCollision">
+      <h4 class="signature"><a href="PolyCircleCollision.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">PolyCircleCollision</span><span class="params">(<span name="p">p: ConvexPolygon</span>, <span name="c">c: Circle</span>)</span><span class="result"> extends Collision with Product</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">Collision between a convex polygon and a circle</p>
+    </li><li name="sims.collision.PolyCollision">
+      <h4 class="signature"><a href="PolyCollision.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">PolyCollision</span><span class="params">(<span name="p1">p1: ConvexPolygon</span>, <span name="p2">p2: ConvexPolygon</span>)</span><span class="result"> extends Collision with Product</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">Collision between two convex polygons</p>
+    </li></ol>
+            </div>
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.collision.Collision">
+      <h4 class="signature"><a href="Collision$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Collision</span><span class="result"> extends AnyRef</span>
+      </span>
+      </a></h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics$content.html b/doc/sims/dynamics$content.html
deleted file mode 100644
index 8cbd40c..0000000
--- a/doc/sims/dynamics$content.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>All classes and objects in sims.dynamics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../script.js"></script>
-        </head>
-        <body onload="init()"><div class="page-title"><div>Simple Mechanics Simulator (SiMS) API</div></div><p><div>This document is the API specification for SiMS</div></p><table summary="" cellpadding="3" class="member">
-        <tr><td class="title" colspan="2">Class Summary</td></tr>
-        <tr>
-      <td class="modifiers" valign="top"> 
-        <code> class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/dynamics/Body.html" target="_self">Body</a></em>
-        (<em>shps</em> : <a href="../sims/dynamics/Shape.html" target="_self">Shape</a>*)<code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        <div>A two dimensional rigid body is made out of shapes.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/dynamics/Circle.html" target="_self">Circle</a></em>
-        (<code>val </code><em>radius</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <code>val </code><em>density</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>)<code> extends </code><a href="../sims/dynamics/Shape.html" target="_self">Shape</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        <div>A circle.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> trait</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/dynamics/Constraint.html" target="_self">Constraint</a></em>
-        <code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        <div>All constraints in SiMS implement this trait.
- Position and velocity can be corrected for each constraint.
- The implementation of constraints was inspired by Erin Catto's box2d.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/dynamics/Rectangle.html" target="_self">Rectangle</a></em>
-        (<code>val </code><em>halfWidth</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <code>val </code><em>halfHeight</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <code>val </code><em>density</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>)<code> extends </code><a href="../sims/dynamics/Shape.html" target="_self">Shape</a><code> with </code><a href="../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        <div>A rectangle is a polygon.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/dynamics/RegularPolygon.html" target="_self">RegularPolygon</a></em>
-        (<code>val </code><em>n</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>, <code>val </code><em>radius</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <code>val </code><em>density</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>)<code> extends </code><a href="../sims/dynamics/Shape.html" target="_self">Shape</a><code> with </code><a href="../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        <div>A regular polygon with <code>n</code> sides whose excircle has a radius <code>radius</code>.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/dynamics/Shape.html" target="_self">Shape</a></em>
-        <code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        <div>An abstract shape.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/dynamics/World.html" target="_self">World</a></em>
-        <code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        <div>A world contains and simulates a system of rigid bodies and joints.</div>
-      </td>
-    </tr>        
-        </table>
-<table summary="" cellpadding="3" class="member">
-        <tr><td class="title" colspan="2">Object Summary</td></tr>
-        <tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/dynamics/Body$object.html" target="_self">Body</a></em>
-        <code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/dynamics/Circle$object.html" target="_self">Circle</a></em>
-        <code> extends </code>(<a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) =&gt; <a href="../sims/dynamics/Circle.html" target="_self">Circle</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/dynamics/Rectangle$object.html" target="_self">Rectangle</a></em>
-        <code> extends </code>(<a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) =&gt; <a href="../sims/dynamics/Rectangle.html" target="_self">Rectangle</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/dynamics/RegularPolygon$object.html" target="_self">RegularPolygon</a></em>
-        <code> extends </code>(<a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) =&gt; <a href="../sims/dynamics/RegularPolygon.html" target="_self">RegularPolygon</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/dynamics/Shape$object.html" target="_self">Shape</a></em>
-        <code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        
-      </td>
-    </tr>        
-        </table></body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics$package.html b/doc/sims/dynamics$package.html
deleted file mode 100644
index b2430c2..0000000
--- a/doc/sims/dynamics$package.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>List of classes and objects in package sims.dynamics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../script.js"></script>
-        </head>
-        <body onload="init()"><table summary="" class="navigation">
-          <tr><td class="navigation-links" valign="top">
-            <a href="../sims/dynamics$content.html" target="contentFrame">sims.dynamics</a>
-          </td></tr>
-        </table><div><div class="kinds" id="Classes">Classes</div><ul class="list">
-        <li id="Classes_B"><a href="../sims/dynamics/Body.html" target="contentFrame">Body</a></li>
-<li id="Classes_C"><a href="../sims/dynamics/Circle.html" target="contentFrame">Circle</a></li>
-<li><a href="../sims/dynamics/Constraint.html" target="contentFrame">Constraint</a></li>
-<li id="Classes_R"><a href="../sims/dynamics/Rectangle.html" target="contentFrame">Rectangle</a></li>
-<li><a href="../sims/dynamics/RegularPolygon.html" target="contentFrame">RegularPolygon</a></li>
-<li id="Classes_S"><a href="../sims/dynamics/Shape.html" target="contentFrame">Shape</a></li>
-<li id="Classes_W"><a href="../sims/dynamics/World.html" target="contentFrame">World</a></li>
-        </ul>
-<div class="kinds" id="Objects">Objects</div><ul class="list">
-        <li id="Objects_B"><a href="../sims/dynamics/Body$object.html" target="contentFrame">Body</a></li>
-<li id="Objects_C"><a href="../sims/dynamics/Circle$object.html" target="contentFrame">Circle</a></li>
-<li id="Objects_R"><a href="../sims/dynamics/Rectangle$object.html" target="contentFrame">Rectangle</a></li>
-<li><a href="../sims/dynamics/RegularPolygon$object.html" target="contentFrame">RegularPolygon</a></li>
-<li id="Objects_S"><a href="../sims/dynamics/Shape$object.html" target="contentFrame">Shape</a></li>
-        </ul></div></body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/Body$.html b/doc/sims/dynamics/Body$.html
new file mode 100644
index 0000000..c9c6b49
--- /dev/null
+++ b/doc/sims/dynamics/Body$.html
@@ -0,0 +1,148 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for sims.dynamics.Body</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">dynamics</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>Body</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Body</span><span class="result"> extends AnyRef</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/Body$object.html b/doc/sims/dynamics/Body$object.html
deleted file mode 100644
index fe5fec2..0000000
--- a/doc/sims/dynamics/Body$object.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Body in sims.dynamics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/dynamics$package.html" target="_self">sims.dynamics</a>
-        <br></br>
-        <span class="entity">object  Body</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/dynamics/Body"><code>sims/dynamics/Body.scala</code></a>]
-      </div><hr></hr>
-      <a name="Body"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Body</em>
-      </dt>
-      <dd><code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/Body.html b/doc/sims/dynamics/Body.html
index 4bacab2..858116a 100644
--- a/doc/sims/dynamics/Body.html
+++ b/doc/sims/dynamics/Body.html
@@ -1,660 +1,490 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class Body in sims.dynamics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/dynamics$package.html" target="_self">sims.dynamics</a>
-        <br></br>
-        <span class="entity">class  Body</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/dynamics/Body"><code>sims/dynamics/Body.scala</code></a>]
-      </div><hr></hr>
-      <a name="Body"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>class</code>
-        <em>Body</em>(<em>shps</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>*)
-      </dt>
-      <dd><code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a></dd>
-    </dl>
-      <dl><dd>A two dimensional rigid body is made out of shapes.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>shps - </code>shapes that belong to this body.</dd></dl>
+        <head>
+          <title>Scaladoc for sims.dynamics.Body</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
     
+        </head>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">dynamics</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Body.html#angularVelocity" target="_self">angularVelocity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Angular velocity of this body.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Body.html#force" target="_self">force</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Resulting force on the COM of this body.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Body.html#linearVelocity" target="_self">linearVelocity</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Linear velocity of this body.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Body.html#monitor" target="_self">monitor</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>Flag for a world to monitor the properties of this body.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Body.html#shapes" target="_self">shapes</a></em>
-         : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>]
-        
-        <div>Shapes that belong to this body.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Body.html#torque" target="_self">torque</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Resulting torque on this body.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Body.html#uid" target="_self">uid</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Unique identification number.</div>
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Body.html#I" target="_self">I</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Returns the moment of inertia for rotations about the COM of this body.
-   It is calculated using the moments of inertia of this body's shapes and the parallel axis theorem.
-   If the body is fixed, its moment of inertia is infinite (<code>Double.PositiveInfinity</code>).</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Body.html#applyForce%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">applyForce</a></em>
-        (<em>force</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Applies a force to a point on this body. Warning: the point is considered to be contained within this body.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Body.html#applyForce%28sims.geometry.Vector2D%29" target="_self">applyForce</a></em>
-        (<em>force</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Applies a force to the COM of this body.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Body.html#applyImpulse%28sims.geometry.Vector2D%29" target="_self">applyImpulse</a></em>
-        (<em>impulse</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Applies an impulse to the COM of this body.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Body.html#applyImpulse%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">applyImpulse</a></em>
-        (<em>impulse</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Applies an impulse to a point on this body. Warning: the point is considered to be contained within this body.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Body.html#contains%28sims.geometry.Vector2D%29" target="_self">contains</a></em>
-        (<em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>Checks if the point <code>point</code> is contained in this body.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Body.html#fixed" target="_self">fixed</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>Returns whether this body is fixed or not.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Body.html#fixed_%3D%28Boolean%29" target="_self">fixed_=</a></em>
-        (<em>value</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Fixes or frees this body. By fixing, linear and angular velocities are set to zero.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Body.html#mass" target="_self">mass</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Returns the mass of this body. If the body is free, its mass is the sum of the masses of its shapes.
-   If the body is fixed, its mass is infinite (<code>Double.PositiveInfinity</code>).</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Body.html#pos" target="_self">pos</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Returns the position of this body. The position is equivalent to the center of mass.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Body.html#pos_%3D%28sims.geometry.Vector2D%29" target="_self">pos_=</a></em>
-        (<em>newPos</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Sets the position of this body. By doing so all its shapes are translated.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Body.html#rotation" target="_self">rotation</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Returns the current rotation of this body.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Body.html#rotation_%3D%28Double%29" target="_self">rotation_=</a></em>
-        (<em>newRotation</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Sets the rotation of this body. Position and rotation of shapes are modified accordingly.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Body.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Body.html#velocityOfPoint%28sims.geometry.Vector2D%29" target="_self">velocityOfPoint</a></em>
-        (<em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Linear velocity of the given point on this body (in world coordinates).</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Body.html#%7E%28sims.dynamics.Body%29" target="_self">~</a></em>
-        (<em>b</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>) : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        <div>Creates a new body containing this body's shapes and the shapes of another body <code>b</code>.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Body.html#%7E%28sims.dynamics.Shape%29" target="_self">~</a></em>
-        (<em>s</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>) : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        <div>Creates a new body containing this body's shapes and the shape <code>s</code>.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>Body</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Body</span><span class="result"> extends AnyRef</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>A two dimensional rigid body is made out of shapes.</p></div>
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="uid"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>uid</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Unique identification number.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="shapes"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>shapes</em> : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>]
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Shapes that belong to this body.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="monitor"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>monitor</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Flag for a world to monitor the properties of this body.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>See Also</b></dt><dd><a href="../../sims/dynamics/World.html#monitors" target="_self">World#monitors</a></dd></dl>
-    <hr></hr>
-<a name="linearVelocity"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>linearVelocity</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Linear velocity of this body.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="angularVelocity"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>angularVelocity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Angular velocity of this body.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="force"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>force</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Resulting force on the COM of this body.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="torque"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>torque</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Resulting torque on this body.</dd></dl>
-      <dl></dl>
-    <hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="fixed"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>fixed</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns whether this body is fixed or not.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="fixed_%3D%28Boolean%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>fixed_=</em>(<em>value</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Fixes or frees this body. By fixing, linear and angular velocities are set to zero.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="pos"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>pos</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns the position of this body. The position is equivalent to the center of mass.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>position of this body</dd></dl>
-    <hr></hr>
-<a name="pos_%3D%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>pos_=</em>(<em>newPos</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Sets the position of this body. By doing so all its shapes are translated.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>newPos - </code>new position</dd></dl>
-    <hr></hr>
-<a name="rotation"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>rotation</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns the current rotation of this body.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="rotation_%3D%28Double%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>rotation_=</em>(<em>newRotation</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Sets the rotation of this body. Position and rotation of shapes are modified accordingly.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>r - </code>new rotation</dd></dl>
-    <hr></hr>
-<a name="velocityOfPoint%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>velocityOfPoint</em>(<em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Linear velocity of the given point on this body (in world coordinates).</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="mass"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>mass</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns the mass of this body. If the body is free, its mass is the sum of the masses of its shapes.
-   If the body is fixed, its mass is infinite (<code>Double.PositiveInfinity</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>this body's mass</dd></dl>
-    <hr></hr>
-<a name="I"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>I</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns the moment of inertia for rotations about the COM of this body.
-   It is calculated using the moments of inertia of this body's shapes and the parallel axis theorem.
-   If the body is fixed, its moment of inertia is infinite (<code>Double.PositiveInfinity</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>moment of inertia for rotations about the COM of this body</dd></dl>
-    <hr></hr>
-<a name="applyForce%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>applyForce</em>(<em>force</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Applies a force to the COM of this body.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>force - </code>applied force</dd></dl>
-    <hr></hr>
-<a name="applyForce%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>applyForce</em>(<em>force</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Applies a force to a point on this body. Warning: the point is considered to be contained within this body.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>force - </code>applied force</dd><dd><code>point - </code>position vector of the point (in world coordinates)</dd></dl>
-    <hr></hr>
-<a name="applyImpulse%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>applyImpulse</em>(<em>impulse</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Applies an impulse to the COM of this body.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>impulse - </code>applied impulse</dd></dl>
-    <hr></hr>
-<a name="applyImpulse%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>applyImpulse</em>(<em>impulse</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Applies an impulse to a point on this body. Warning: the point is considered to be contained within this body.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>impulse - </code>applied impulse</dd><dd><code>point - </code>position vector of the point (in world coordinates)</dd></dl>
-    <hr></hr>
-<a name="contains%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>contains</em>(<em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Checks if the point <code>point</code> is contained in this body.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="%7E%28sims.dynamics.Shape%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>~</em>(<em>s</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>) : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Creates a new body containing this body's shapes and the shape <code>s</code>.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>s - </code>new shape</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>new body</dd></dl>
-    <hr></hr>
-<a name="%7E%28sims.dynamics.Body%29"></a><dl>
-      <dt>
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.dynamics.Body#I">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">I</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the moment of inertia for rotations about the COM of this body</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the moment of inertia for rotations about the COM of this body.
+It is calculated using the moments of inertia of this body's shapes and the parallel axis theorem.
+If the body is fixed, its moment of inertia is infinite (<code>Double.PositiveInfinity</code>).</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Body#angularVelocity">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">angularVelocity</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Angular velocity of this body</p><div class="fullcomment">
+      <div class="comment cmt"><p>Angular velocity of this body.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Body#applyForce">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">applyForce</span><span class="params">(<span name="force">force: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="point">point: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Applies a force to a point on this body</p><div class="fullcomment">
+      <div class="comment cmt"><p>Applies a force to a point on this body. Warning: the point is considered to be contained within this body.</p></div>
+      <dl class="paramcmts block"><dt class="param">force</dt><dd class="cmt"><p>applied force</p></dd><dt class="param">point</dt><dd class="cmt"><p>position vector of the point (in world coordinates)</p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Body#applyForce">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">applyForce</span><span class="params">(<span name="force">force: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Applies a force to the COM of this body</p><div class="fullcomment">
+      <div class="comment cmt"><p>Applies a force to the COM of this body.</p></div>
+      <dl class="paramcmts block"><dt class="param">force</dt><dd class="cmt"><p>applied force</p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Body#applyImpulse">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">applyImpulse</span><span class="params">(<span name="impulse">impulse: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="point">point: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Applies an impulse to a point on this body</p><div class="fullcomment">
+      <div class="comment cmt"><p>Applies an impulse to a point on this body. Warning: the point is considered to be contained within this body.</p></div>
+      <dl class="paramcmts block"><dt class="param">impulse</dt><dd class="cmt"><p>applied impulse</p></dd><dt class="param">point</dt><dd class="cmt"><p>position vector of the point (in world coordinates)</p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Body#applyImpulse">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">applyImpulse</span><span class="params">(<span name="impulse">impulse: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Applies an impulse to the COM of this body</p><div class="fullcomment">
+      <div class="comment cmt"><p>Applies an impulse to the COM of this body.</p></div>
+      <dl class="paramcmts block"><dt class="param">impulse</dt><dd class="cmt"><p>applied impulse</p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Body#contains">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">contains</span><span class="params">(<span name="point">point: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Checks if the point <code>point</code> is contained in this body</p><div class="fullcomment">
+      <div class="comment cmt"><p>Checks if the point <code>point</code> is contained in this body.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Body#fixed">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fixed</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns whether this body is fixed or not</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns whether this body is fixed or not.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Body#fixed_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">fixed_=</span><span class="params">(<span name="value">value: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Fixes or frees this body</p><div class="fullcomment">
+      <div class="comment cmt"><p>Fixes or frees this body. By fixing, linear and angular velocities are set to zero.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Body#force">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">force</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Resulting force on the COM of this body</p><div class="fullcomment">
+      <div class="comment cmt"><p>Resulting force on the COM of this body.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Body#linearVelocity">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">linearVelocity</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Linear velocity of this body</p><div class="fullcomment">
+      <div class="comment cmt"><p>Linear velocity of this body.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Body#mass">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">mass</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the mass of this body</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the mass of this body. If the body is free, its mass is the sum of the masses of its shapes.
+If the body is fixed, its mass is infinite (<code>Double.PositiveInfinity</code>).</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Body#monitor">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">monitor</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Flag for a world to monitor the properties of this body</p><div class="fullcomment">
+      <div class="comment cmt"><p>Flag for a world to monitor the properties of this body.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Body#pos">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">pos</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the position of this body</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the position of this body. The position is equivalent to the center of mass.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Body#pos_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">pos_=</span><span class="params">(<span name="newPos">newPos: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Sets the position of this body</p><div class="fullcomment">
+      <div class="comment cmt"><p>Sets the position of this body. By doing so all its shapes are translated.</p></div>
+      <dl class="paramcmts block"><dt class="param">newPos</dt><dd class="cmt"><p>new position</p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Body#rotation">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">rotation</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the current rotation of this body</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the current rotation of this body.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Body#rotation_=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">rotation_=</span><span class="params">(<span name="newRotation">newRotation: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Sets the rotation of this body</p><div class="fullcomment">
+      <div class="comment cmt"><p>Sets the rotation of this body. Position and rotation of shapes are modified accordingly.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Body#shapes">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">shapes</span><span class="result">: <span class="extype" name="scala.collection.immutable.List">List</span>[<a href="Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Shapes that belong to this body</p><div class="fullcomment">
+      <div class="comment cmt"><p>Shapes that belong to this body.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Body#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Body#torque">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">torque</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Resulting torque on this body</p><div class="fullcomment">
+      <div class="comment cmt"><p>Resulting torque on this body.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Body#uid">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">uid</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Unique identification number</p><div class="fullcomment">
+      <div class="comment cmt"><p>Unique identification number.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Body#velocityOfPoint">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">velocityOfPoint</span><span class="params">(<span name="point">point: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Linear velocity of the given point on this body (in world coordinates)</p><div class="fullcomment">
+      <div class="comment cmt"><p>Linear velocity of the given point on this body (in world coordinates).</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Body#~">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">~</span><span class="params">(<span name="b">b: <a href="" class="extype" name="sims.dynamics.Body">Body</a></span>)</span><span class="result">: <a href="" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Creates a new body containing this body's shapes and the shapes of another body <code>b</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Creates a new body containing this body's shapes and the shapes of another body <code>b</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">b</dt><dd class="cmt"><p>body with extra shapes</p></dd><dt>returns</dt><dd class="cmt"><p>new body</p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Body#~">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">~</span><span class="params">(<span name="s">s: <a href="Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>)</span><span class="result">: <a href="" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Creates a new body containing this body's shapes and the shape <code>s</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Creates a new body containing this body's shapes and the shape <code>s</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">s</dt><dd class="cmt"><p>new shape</p></dd><dt>returns</dt><dd class="cmt"><p>new body</p></dd></dl>
+      
+      
+      
+    </div>
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.dynamics.Body#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Body</span><span class="params">(<span name="shps">shps: <a href="Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a>*</span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Body</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>~</em>(<em>b</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>) : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Creates a new body containing this body's shapes and the shapes of another body <code>b</code>.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>b - </code>body with extra shapes</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>new body</dd></dl>
-    <hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/Circle$object.html b/doc/sims/dynamics/Circle$object.html
deleted file mode 100644
index 086b684..0000000
--- a/doc/sims/dynamics/Circle$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Circle in sims.dynamics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/dynamics$package.html" target="_self">sims.dynamics</a>
-        <br></br>
-        <span class="entity">object  Circle</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/dynamics/Circle"><code>sims/dynamics/Circle.scala</code></a>]
-      </div><hr></hr>
-      <a name="Circle"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Circle</em>
-      </dt>
-      <dd><code> extends </code>(<a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) =&gt; <a href="../../sims/dynamics/Circle.html" target="_self">Circle</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function2">scala.Function2</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function2">scala.Function2.toString</a>, <a href="#curry" target="contentFrame" class="scala/Function2">scala.Function2.curry</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/Circle.html b/doc/sims/dynamics/Circle.html
index f5a1655..47526f7 100644
--- a/doc/sims/dynamics/Circle.html
+++ b/doc/sims/dynamics/Circle.html
@@ -1,454 +1,530 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class Circle in sims.dynamics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for sims.dynamics.Circle</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/dynamics$package.html" target="_self">sims.dynamics</a>
-        <br></br>
-        <span class="entity">class  Circle</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/dynamics/Circle"><code>sims/dynamics/Circle.scala</code></a>]
-      </div><hr></hr>
-      <a name="Circle"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>Circle</em>(<code>val </code><em>radius</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <code>val </code><em>density</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>)
-      </dt>
-      <dd><code> extends </code><a href="../../sims/dynamics/Shape.html" target="_self">Shape</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
-      <dl><dd>A circle.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>radius - </code>radius of this circle</dd><dd><code>density - </code>density of this circle</dd></dl>
-    <dl>
-      <dt style="margin:10px 0 0 20px;"><b>Direct Known Subclasses:</b></dt>
-      <dd><a href="../../graphyx/graphics/GraphicalCircle.html" target="_self">GraphicalCircle</a></dd>
-      </dl><hr></hr>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">dynamics</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Circle.html#I" target="_self">I</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Moment of inertia for a rotation about this shape's COM.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Circle.html#volume" target="_self">volume</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Volume. The volume is actually equivalent to this shape's area (SiMS is in 2D)
-   and is used with this shape's density to calculate its mass.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/dynamics/Shape.html#uid" target="_self">uid</a>, <a href="../../sims/dynamics/Shape.html#collidable" target="_self">collidable</a>, <a href="../../sims/dynamics/Shape.html#restitution" target="_self">restitution</a>, <a href="../../sims/dynamics/Shape.html#friction" target="_self">friction</a>, <a href="../../sims/dynamics/Shape.html#pos" target="_self">pos</a>, <a href="../../sims/dynamics/Shape.html#rotation" target="_self">rotation</a>, <a href="../../sims/dynamics/Shape.html#rotation0" target="_self">rotation0</a>, <a href="../../sims/dynamics/Shape.html#refLocalPos" target="_self">refLocalPos</a>, <a href="../../sims/dynamics/Shape.html#transientShapes" target="_self">transientShapes</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Circle.html#AABB" target="_self">AABB</a></em>
-         : <a href="../../sims/collision/AABB.html" target="_self">AABB</a>
-        
-        <div>Returns this shape's axis aligned bounding box.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Circle.html#contains%28sims.geometry.Vector2D%29" target="_self">contains</a></em>
-        (<em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>Checks if the point <code>point</code> is contained in this shape.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Circle.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Circle.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Circle.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Circle.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Circle.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Circle.html#project%28sims.geometry.Vector2D%29" target="_self">project</a></em>
-        (<em>axis</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/geometry/Projection.html" target="_self">Projection</a>
-        
-        <div>Returns the projection of this shape onto the line given by the directional vector <code>axis</code>.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Circle.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/dynamics/Shape.html#mass" target="_self">mass</a>, <a href="../../sims/dynamics/Shape.html#body" target="_self">body</a>, <a href="../../sims/dynamics/Shape.html#asBody" target="_self">asBody</a>, <a href="../../sims/dynamics/Shape.html#%7E%28sims.dynamics.Shape%29" target="_self">~</a>, <a href="../../sims/dynamics/Shape.html#%7E%28sims.dynamics.Body%29" target="_self">~</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>Circle</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Circle</span><span class="params">(<span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>, <span name="density">density: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result"> extends <a href="Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a> with <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>A circle.</p></div>
+      <dl class="paramcmts block"><dt class="param">radius</dt><dd class="cmt"><p>radius of this circle</p></dd><dt class="param">density</dt><dd class="cmt"><p>density of this circle</p></dd></dl>
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="volume"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>volume</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Volume. The volume is actually equivalent to this shape's area (SiMS is in 2D)
-   and is used with this shape's density to calculate its mass.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>.<a href="../../sims/dynamics/Shape.html#volume" target="_self">volume</a>
-        </dd>
-      </dl><hr></hr>
-<a name="I"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>I</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Moment of inertia for a rotation about this shape's COM.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>.<a href="../../sims/dynamics/Shape.html#I" target="_self">I</a>
-        </dd>
-      </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="AABB"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>AABB</em> : <a href="../../sims/collision/AABB.html" target="_self">AABB</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns this shape's axis aligned bounding box.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>.<a href="../../sims/dynamics/Shape.html#AABB" target="_self">AABB</a>
-        </dd>
-      </dl><hr></hr>
-<a name="project%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>project</em>(<em>axis</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/geometry/Projection.html" target="_self">Projection</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns the projection of this shape onto the line given by the directional vector <code>axis</code>.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>axis - </code>directional vector of the line</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>projection of this shape</dd></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>.<a href="../../sims/dynamics/Shape.html#project%28sims.geometry.Vector2D%29" target="_self">project</a>
-        </dd>
-      </dl><hr></hr>
-<a name="contains%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>contains</em>(<em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Checks if the point <code>point</code> is contained in this shape.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>.<a href="../../sims/dynamics/Shape.html#contains%28sims.geometry.Vector2D%29" target="_self">contains</a>
-        </dd>
-      </dl><hr></hr>
-<a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
+      
+      <div class="block">
+                known subclasses: <a href="../../graphyx/graphics/GraphicalCircle.html">GraphicalCircle</a>
+              </div>
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="sims.dynamics.Shape">Shape</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.dynamics.Circle#AABB">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">AABB</span><span class="result">: <a href="../collision/AABB.html" class="extype" name="sims.collision.AABB">AABB</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns this shape's axis aligned bounding box</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns this shape's axis aligned bounding box.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Circle#I">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">I</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Moment of inertia for a rotation about this shape's COM</p><div class="fullcomment">
+      <div class="comment cmt"><p>Moment of inertia for a rotation about this shape's COM.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#asBody">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">asBody</span><span class="result">: <a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Creates a new body made out of tis shape</p><div class="fullcomment">
+      <div class="comment cmt"><p>Creates a new body made out of tis shape.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#body">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">body</span><span class="result">: <a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns this shape's containing body</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns this shape's containing body.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Circle#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Shape#collidable">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">collidable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Flag determining this shapes ability to collide with other shapes</p><div class="fullcomment">
+      <div class="comment cmt"><p>Flag determining this shapes ability to collide with other shapes.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Circle#contains">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">contains</span><span class="params">(<span name="point">point: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Checks if the point <code>point</code> is contained in this shape</p><div class="fullcomment">
+      <div class="comment cmt"><p>Checks if the point <code>point</code> is contained in this shape.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Circle#density">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">density</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Density</p><div class="fullcomment">
+      <div class="comment cmt"><p>Density. (Mass per area)</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Circle#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#friction">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">friction</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Part of the coefficient of friction for a collision between this shape and another</p><div class="fullcomment">
+      <div class="comment cmt"><p>Part of the coefficient of friction for a collision between this shape and another.
+The coefficient of friction is calculated out of the product of this part and the other shape's part.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Circle#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#mass">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">mass</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the mass of this shape</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the mass of this shape. The mass is given by volume times density.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#pos">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">pos</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Position of this shape's COM (in world coordinates)</p><div class="fullcomment">
+      <div class="comment cmt"><p>Position of this shape's COM (in world coordinates).</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Circle#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Circle#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Circle#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Circle#project">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">project</span><span class="params">(<span name="axis">axis: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <a href="../geometry/Projection.html" class="extype" name="sims.geometry.Projection">Projection</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the projection of this shape onto the line given by the directional vector <code>axis</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the projection of this shape onto the line given by the directional vector <code>axis</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">axis</dt><dd class="cmt"><p>directional vector of the line</p></dd><dt>returns</dt><dd class="cmt"><p>projection of this shape</p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Circle#radius">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">radius</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Shape#refLocalPos">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">refLocalPos</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Local position of this shape's body COM to its COM at a body rotation of zero</p><div class="fullcomment">
+      <div class="comment cmt"><p>Local position of this shape's body COM to its COM at a body rotation of zero.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#restitution">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">restitution</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Part of the coefficient of restitution for a collision between this shape and another</p><div class="fullcomment">
+      <div class="comment cmt"><p>Part of the coefficient of restitution for a collision between this shape and another.
+The coefficient of restitution is calculated out of the product of this part and the other shape's part.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#rotation">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">rotation</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Rotation of this shape about its COM</p><div class="fullcomment">
+      <div class="comment cmt"><p>Rotation of this shape about its COM.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#rotation0">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">rotation0</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Initial rotation</p><div class="fullcomment">
+      <div class="comment cmt"><p>Initial rotation. Rotation of this shape before it was added to a body.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Circle#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#transientShapes">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">transientShapes</span><span class="result">: <span class="extype" name="scala.collection.mutable.Set">Set</span>[<a href="Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Shapes with which this shape cannot collide</p><div class="fullcomment">
+      <div class="comment cmt"><p>Shapes with which this shape cannot collide.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#uid">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">uid</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Unique identification number</p><div class="fullcomment">
+      <div class="comment cmt"><p>Unique identification number.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Circle#volume">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">volume</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Volume</p><div class="fullcomment">
+      <div class="comment cmt"><p>Volume. The volume is actually equivalent to this shape's area (SiMS is in 2D)
+and is used with this shape's density to calculate its mass.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#~">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">~</span><span class="params">(<span name="b">b: <a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>)</span><span class="result">: <a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Creates a new body out of this shape and the shapes of body <code>b</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Creates a new body out of this shape and the shapes of body <code>b</code>.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#~">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">~</span><span class="params">(<span name="s">s: <a href="Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>)</span><span class="result">: <a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Creates a new body out of this shape and the shape <code>s</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Creates a new body out of this shape and the shape <code>s</code>.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.dynamics.Circle#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Circle</span><span class="params">(<span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>, <span name="density">density: <span class="extype" name="scala.Double">Double</span></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Shape#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Circle</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/Constraint.html b/doc/sims/dynamics/Constraint.html
index 570f522..23264ed 100644
--- a/doc/sims/dynamics/Constraint.html
+++ b/doc/sims/dynamics/Constraint.html
@@ -1,134 +1,184 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>trait Constraint in sims.dynamics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for sims.dynamics.Constraint</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/dynamics$package.html" target="_self">sims.dynamics</a>
-        <br></br>
-        <span class="entity">trait  Constraint</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/dynamics/Constraint"><code>sims/dynamics/Constraint.scala</code></a>]
-      </div><hr></hr>
-      <a name="Constraint"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>trait</code>
-        <em>Constraint</em>
-      </dt>
-      <dd><code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a></dd>
-    </dl>
-      <dl><dd>All constraints in SiMS implement this trait.
- Position and velocity can be corrected for each constraint.
- The implementation of constraints was inspired by Erin Catto's box2d.</dd></dl>
-      <dl></dl>
-    <dl>
-      <dt style="margin:10px 0 0 20px;"><b>Direct Known Subclasses:</b></dt>
-      <dd><a href="../../sims/collision/Collision.html" target="_self">Collision</a>, <a href="../../sims/dynamics/joints/Joint.html" target="_self">Joint</a></dd>
-      </dl><hr></hr>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">dynamics</a></p>
 
+      <div id="definition">
+        <img src="../../lib/trait_big.png" />
+        <h1>Constraint</h1>
+      </div>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Constraint.html#correctPosition%28Double%29" target="_self">correctPosition</a></em>
-        (<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
+      <h4 class="signature">
+      <span class="kind">trait</span>
+      <span class="symbol">
+        <span class="name">Constraint</span><span class="result"> extends AnyRef</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>All constraints in SiMS implement this trait.
+Position and velocity can be corrected for each constraint.
+The implementation of constraints was inspired by Erin Catto's box2d.</p></div>
+      
+      
+      
+      <div class="block">
+                known subclasses: <a href="joints/Joint.html">Joint</a>, <a href="../collision/Collision.html">Collision</a>
+              </div>
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <div>Corrects the positions of bodies according to this constraint.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Constraint.html#correctVelocity%28Double%29" target="_self">correctVelocity</a></em>
-        (<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
         
-        <div>Corrects the velocities of bodies according to this constraint.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.dynamics.Constraint#correctPosition">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctPosition</span><span class="params">(<span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Corrects the positions of bodies according to this constraint</p><div class="fullcomment">
+      <div class="comment cmt"><p>Corrects the positions of bodies according to this constraint.</p></div>
+      <dl class="paramcmts block"><dt class="param">h</dt><dd class="cmt"><p>a time interval, used for converting forces and impulses</p></dd></dl>
+      <div class="block">
+            attributes: abstract 
+          </div>
       
-
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="correctVelocity%28Double%29"></a><dl>
-      <dt>
+      
+    </div>
+    </li><li name="sims.dynamics.Constraint#correctVelocity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctVelocity</span><span class="params">(<span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Corrects the velocities of bodies according to this constraint</p><div class="fullcomment">
+      <div class="comment cmt"><p>Corrects the velocities of bodies according to this constraint.</p></div>
+      <dl class="paramcmts block"><dt class="param">h</dt><dd class="cmt"><p>a time interval, used for converting forces and impulses</p></dd></dl>
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code>abstract</code>
-        <code>def</code>
-        <em>correctVelocity</em>(<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Corrects the velocities of bodies according to this constraint.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>h - </code>a time interval, used for converting forces and impulses</dd></dl>
-    <hr></hr>
-<a name="correctPosition%28Double%29"></a><dl>
-      <dt>
         
-        <code>abstract</code>
-        <code>def</code>
-        <em>correctPosition</em>(<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Corrects the positions of bodies according to this constraint.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>h - </code>a time interval, used for converting forces and impulses</dd></dl>
-    <hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+        
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/Rectangle$object.html b/doc/sims/dynamics/Rectangle$object.html
deleted file mode 100644
index 7c76345..0000000
--- a/doc/sims/dynamics/Rectangle$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Rectangle in sims.dynamics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/dynamics$package.html" target="_self">sims.dynamics</a>
-        <br></br>
-        <span class="entity">object  Rectangle</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/dynamics/Rectangle"><code>sims/dynamics/Rectangle.scala</code></a>]
-      </div><hr></hr>
-      <a name="Rectangle"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Rectangle</em>
-      </dt>
-      <dd><code> extends </code>(<a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) =&gt; <a href="../../sims/dynamics/Rectangle.html" target="_self">Rectangle</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function3">scala.Function3</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function3">scala.Function3.toString</a>, <a href="#curry" target="contentFrame" class="scala/Function3">scala.Function3.curry</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/Rectangle.html b/doc/sims/dynamics/Rectangle.html
index df238de..63ef89d 100644
--- a/doc/sims/dynamics/Rectangle.html
+++ b/doc/sims/dynamics/Rectangle.html
@@ -1,430 +1,598 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class Rectangle in sims.dynamics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for sims.dynamics.Rectangle</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/dynamics$package.html" target="_self">sims.dynamics</a>
-        <br></br>
-        <span class="entity">class  Rectangle</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/dynamics/Rectangle"><code>sims/dynamics/Rectangle.scala</code></a>]
-      </div><hr></hr>
-      <a name="Rectangle"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>Rectangle</em>(<code>val </code><em>halfWidth</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <code>val </code><em>halfHeight</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <code>val </code><em>density</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>)
-      </dt>
-      <dd><code> extends </code><a href="../../sims/dynamics/Shape.html" target="_self">Shape</a><code> with </code><a href="../../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
-      <dl><dd>A rectangle is a polygon.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>halfWidth - </code>this rectangle's half width</dd><dd><code>halfHeight - </code>this rectangle's half height</dd><dd><code>density - </code>density of this rectangle</dd></dl>
-    <dl>
-      <dt style="margin:10px 0 0 20px;"><b>Direct Known Subclasses:</b></dt>
-      <dd><a href="../../graphyx/graphics/GraphicalRectangle.html" target="_self">GraphicalRectangle</a></dd>
-      </dl><hr></hr>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">dynamics</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Rectangle.html#I" target="_self">I</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Moment of inertia for a rotation about this shape's COM.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Rectangle.html#volume" target="_self">volume</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Volume. The volume is actually equivalent to this shape's area (SiMS is in 2D)
-   and is used with this shape's density to calculate its mass.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/dynamics/Shape.html#uid" target="_self">uid</a>, <a href="../../sims/dynamics/Shape.html#collidable" target="_self">collidable</a>, <a href="../../sims/dynamics/Shape.html#restitution" target="_self">restitution</a>, <a href="../../sims/dynamics/Shape.html#friction" target="_self">friction</a>, <a href="../../sims/dynamics/Shape.html#pos" target="_self">pos</a>, <a href="../../sims/dynamics/Shape.html#rotation" target="_self">rotation</a>, <a href="../../sims/dynamics/Shape.html#rotation0" target="_self">rotation0</a>, <a href="../../sims/dynamics/Shape.html#refLocalPos" target="_self">refLocalPos</a>, <a href="../../sims/dynamics/Shape.html#transientShapes" target="_self">transientShapes</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Rectangle.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Rectangle.html#halfDiags" target="_self">halfDiags</a></em>
-         : <a href="" target="contentFrame" class="scala/Array">scala.Array</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]
-        
-        <div>Returns the vectors from the center to the vertices of this rectangle.
-   The first vertex is the upper-right vertex at a rotation of 0.
-   Vertices are ordered counter-clockwise.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Rectangle.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Rectangle.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Rectangle.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Rectangle.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Rectangle.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Rectangle.html#vertices" target="_self">vertices</a></em>
-         : <a href="" target="contentFrame" class="scala/Array">scala.Array</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]
-        
-        <div>Returns the position vectors of this rectangle's vertices.
-   The first vertex is the upper-right vertex at a rotation of 0.
-   Vertices are ordered counter-clockwise.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/geometry/ConvexPolygon.html#sides" target="_self">sides</a>, <a href="../../sims/geometry/ConvexPolygon.html#project%28sims.geometry.Vector2D%29" target="_self">project</a>, <a href="../../sims/geometry/ConvexPolygon.html#AABB" target="_self">AABB</a>, <a href="../../sims/geometry/ConvexPolygon.html#contains%28sims.geometry.Vector2D%29" target="_self">contains</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/dynamics/Shape.html#mass" target="_self">mass</a>, <a href="../../sims/dynamics/Shape.html#body" target="_self">body</a>, <a href="../../sims/dynamics/Shape.html#asBody" target="_self">asBody</a>, <a href="../../sims/dynamics/Shape.html#%7E%28sims.dynamics.Shape%29" target="_self">~</a>, <a href="../../sims/dynamics/Shape.html#%7E%28sims.dynamics.Body%29" target="_self">~</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>Rectangle</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Rectangle</span><span class="params">(<span name="halfWidth">halfWidth: <span class="extype" name="scala.Double">Double</span></span>, <span name="halfHeight">halfHeight: <span class="extype" name="scala.Double">Double</span></span>, <span name="density">density: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result"> extends <a href="Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a> with <a href="../geometry/ConvexPolygon.html" class="extype" name="sims.geometry.ConvexPolygon">ConvexPolygon</a> with <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>A rectangle is a polygon.</p></div>
+      <dl class="paramcmts block"><dt class="param">halfWidth</dt><dd class="cmt"><p>this rectangle's half width</p></dd><dt class="param">halfHeight</dt><dd class="cmt"><p>this rectangle's half height</p></dd><dt class="param">density</dt><dd class="cmt"><p>density of this rectangle</p></dd></dl>
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="volume"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>volume</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Volume. The volume is actually equivalent to this shape's area (SiMS is in 2D)
-   and is used with this shape's density to calculate its mass.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>.<a href="../../sims/dynamics/Shape.html#volume" target="_self">volume</a>
-        </dd>
-      </dl><hr></hr>
-<a name="I"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>I</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Moment of inertia for a rotation about this shape's COM.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>.<a href="../../sims/dynamics/Shape.html#I" target="_self">I</a>
-        </dd>
-      </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="halfDiags"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>halfDiags</em> : <a href="" target="contentFrame" class="scala/Array">scala.Array</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns the vectors from the center to the vertices of this rectangle.
-   The first vertex is the upper-right vertex at a rotation of 0.
-   Vertices are ordered counter-clockwise.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="vertices"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>vertices</em> : <a href="" target="contentFrame" class="scala/Array">scala.Array</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns the position vectors of this rectangle's vertices.
-   The first vertex is the upper-right vertex at a rotation of 0.
-   Vertices are ordered counter-clockwise.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a>.<a href="../../sims/geometry/ConvexPolygon.html#vertices" target="_self">vertices</a>
-        </dd>
-      </dl><hr></hr>
-<a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
+      
+      <div class="block">
+                known subclasses: <a href="../../graphyx/graphics/GraphicalRectangle.html">GraphicalRectangle</a>
+              </div>
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="sims.geometry.ConvexPolygon">ConvexPolygon</li><li class="in" name="sims.dynamics.Shape">Shape</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.geometry.ConvexPolygon#AABB">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">AABB</span><span class="result">: <a href="../collision/AABB.html" class="extype" name="sims.collision.AABB">AABB</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns this polygon's axis aligned bounding box</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns this polygon's axis aligned bounding box.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../geometry/ConvexPolygon.html">ConvexPolygon</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Rectangle#I">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">I</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Moment of inertia for a rotation about this shape's COM</p><div class="fullcomment">
+      <div class="comment cmt"><p>Moment of inertia for a rotation about this shape's COM.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#asBody">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">asBody</span><span class="result">: <a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Creates a new body made out of tis shape</p><div class="fullcomment">
+      <div class="comment cmt"><p>Creates a new body made out of tis shape.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#body">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">body</span><span class="result">: <a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns this shape's containing body</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns this shape's containing body.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Rectangle#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Shape#collidable">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">collidable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Flag determining this shapes ability to collide with other shapes</p><div class="fullcomment">
+      <div class="comment cmt"><p>Flag determining this shapes ability to collide with other shapes.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.geometry.ConvexPolygon#contains">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">contains</span><span class="params">(<span name="point">point: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Checks if the point <code>point</code> is contained in this polygon</p><div class="fullcomment">
+      <div class="comment cmt"><p>Checks if the point <code>point</code> is contained in this polygon.
+<p>
+A ray is created, originating from the point and following an arbitrary direction (X-Axis was chosen).
+The number of intersections between the ray and this polygon's sides (including vertices) is counted.
+The amount of intersections with vertices is substracted form the previuos number.
+If the latter number is odd, the point is contained in the polygon.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../geometry/ConvexPolygon.html">ConvexPolygon</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Rectangle#density">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">density</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Density</p><div class="fullcomment">
+      <div class="comment cmt"><p>Density. (Mass per area)</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Rectangle#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#friction">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">friction</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Part of the coefficient of friction for a collision between this shape and another</p><div class="fullcomment">
+      <div class="comment cmt"><p>Part of the coefficient of friction for a collision between this shape and another.
+The coefficient of friction is calculated out of the product of this part and the other shape's part.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Rectangle#halfDiags">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">halfDiags</span><span class="result">: <span class="extype" name="scala.Array">Array</span>[<a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the vectors from the center to the vertices of this rectangle</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the vectors from the center to the vertices of this rectangle.
+The first vertex is the upper-right vertex at a rotation of 0.
+Vertices are ordered counter-clockwise.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Rectangle#halfHeight">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">halfHeight</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Rectangle#halfWidth">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">halfWidth</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Rectangle#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#mass">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">mass</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the mass of this shape</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the mass of this shape. The mass is given by volume times density.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#pos">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">pos</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Position of this shape's COM (in world coordinates)</p><div class="fullcomment">
+      <div class="comment cmt"><p>Position of this shape's COM (in world coordinates).</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Rectangle#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Rectangle#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Rectangle#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.ConvexPolygon#project">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">project</span><span class="params">(<span name="axis">axis: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <a href="../geometry/Projection.html" class="extype" name="sims.geometry.Projection">Projection</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the projection of this polygon onto the line given by the directional vector <code>axis</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the projection of this polygon onto the line given by the directional vector <code>axis</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">axis</dt><dd class="cmt"><p>directional vector of the line</p></dd><dt>returns</dt><dd class="cmt"><p>projection of this polygon</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="../geometry/ConvexPolygon.html">ConvexPolygon</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#refLocalPos">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">refLocalPos</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Local position of this shape's body COM to its COM at a body rotation of zero</p><div class="fullcomment">
+      <div class="comment cmt"><p>Local position of this shape's body COM to its COM at a body rotation of zero.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#restitution">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">restitution</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Part of the coefficient of restitution for a collision between this shape and another</p><div class="fullcomment">
+      <div class="comment cmt"><p>Part of the coefficient of restitution for a collision between this shape and another.
+The coefficient of restitution is calculated out of the product of this part and the other shape's part.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#rotation">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">rotation</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Rotation of this shape about its COM</p><div class="fullcomment">
+      <div class="comment cmt"><p>Rotation of this shape about its COM.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#rotation0">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">rotation0</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Initial rotation</p><div class="fullcomment">
+      <div class="comment cmt"><p>Initial rotation. Rotation of this shape before it was added to a body.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.geometry.ConvexPolygon#sides">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">sides</span><span class="result">: <span class="extype" name="scala.Array">Array</span>[<a href="../geometry/Segment.html" class="extype" name="sims.geometry.Segment">Segment</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns all sides of this polygon</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns all sides of this polygon. The sides are ordered counter-clockwise, the first vertex of the side
+giving the side index.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../geometry/ConvexPolygon.html">ConvexPolygon</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Rectangle#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#transientShapes">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">transientShapes</span><span class="result">: <span class="extype" name="scala.collection.mutable.Set">Set</span>[<a href="Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Shapes with which this shape cannot collide</p><div class="fullcomment">
+      <div class="comment cmt"><p>Shapes with which this shape cannot collide.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#uid">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">uid</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Unique identification number</p><div class="fullcomment">
+      <div class="comment cmt"><p>Unique identification number.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Rectangle#vertices">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">vertices</span><span class="result">: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the position vectors of this rectangle's vertices</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the position vectors of this rectangle's vertices.
+The first vertex is the upper-right vertex at a rotation of 0.
+Vertices are ordered counter-clockwise.@return position vectors of the vertices</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Rectangle#volume">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">volume</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Volume</p><div class="fullcomment">
+      <div class="comment cmt"><p>Volume. The volume is actually equivalent to this shape's area (SiMS is in 2D)
+and is used with this shape's density to calculate its mass.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#~">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">~</span><span class="params">(<span name="b">b: <a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>)</span><span class="result">: <a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Creates a new body out of this shape and the shapes of body <code>b</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Creates a new body out of this shape and the shapes of body <code>b</code>.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#~">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">~</span><span class="params">(<span name="s">s: <a href="Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>)</span><span class="result">: <a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Creates a new body out of this shape and the shape <code>s</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Creates a new body out of this shape and the shape <code>s</code>.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.dynamics.Rectangle#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Rectangle</span><span class="params">(<span name="halfWidth">halfWidth: <span class="extype" name="scala.Double">Double</span></span>, <span name="halfHeight">halfHeight: <span class="extype" name="scala.Double">Double</span></span>, <span name="density">density: <span class="extype" name="scala.Double">Double</span></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Shape#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Rectangle</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/RegularPolygon$object.html b/doc/sims/dynamics/RegularPolygon$object.html
deleted file mode 100644
index b2d8a0e..0000000
--- a/doc/sims/dynamics/RegularPolygon$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object RegularPolygon in sims.dynamics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/dynamics$package.html" target="_self">sims.dynamics</a>
-        <br></br>
-        <span class="entity">object  RegularPolygon</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/dynamics/RegularPolygon"><code>sims/dynamics/RegularPolygon.scala</code></a>]
-      </div><hr></hr>
-      <a name="RegularPolygon"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>RegularPolygon</em>
-      </dt>
-      <dd><code> extends </code>(<a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) =&gt; <a href="../../sims/dynamics/RegularPolygon.html" target="_self">RegularPolygon</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function3">scala.Function3</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function3">scala.Function3.toString</a>, <a href="#curry" target="contentFrame" class="scala/Function3">scala.Function3.curry</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/RegularPolygon.html b/doc/sims/dynamics/RegularPolygon.html
index e691f51..b0e8cc9 100644
--- a/doc/sims/dynamics/RegularPolygon.html
+++ b/doc/sims/dynamics/RegularPolygon.html
@@ -1,421 +1,588 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class RegularPolygon in sims.dynamics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for sims.dynamics.RegularPolygon</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/dynamics$package.html" target="_self">sims.dynamics</a>
-        <br></br>
-        <span class="entity">class  RegularPolygon</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/dynamics/RegularPolygon"><code>sims/dynamics/RegularPolygon.scala</code></a>]
-      </div><hr></hr>
-      <a name="RegularPolygon"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>RegularPolygon</em>(<code>val </code><em>n</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>, <code>val </code><em>radius</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <code>val </code><em>density</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>)
-      </dt>
-      <dd><code> extends </code><a href="../../sims/dynamics/Shape.html" target="_self">Shape</a><code> with </code><a href="../../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
-      <dl><dd>A regular polygon with <code>n</code> sides whose excircle has a radius <code>radius</code>.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>n - </code>nmber of sides.</dd><dd><code>radius - </code>radius of the excircle</dd><dd><code>density - </code>density of this regular polygon</dd><dt style="margin:10px 0 0 20px;">
-        <b>Throws</b></dt><dd><code>IllegalArgumentException - </code>if <code>n</code> is smaller than 3</dd></dl>
-    <dl>
-      <dt style="margin:10px 0 0 20px;"><b>Direct Known Subclasses:</b></dt>
-      <dd><a href="../../graphyx/graphics/GraphicalRegularPolygon.html" target="_self">GraphicalRegularPolygon</a></dd>
-      </dl><hr></hr>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">dynamics</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/RegularPolygon.html#I" target="_self">I</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Moment of inertia for a rotation about this shape's COM.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/RegularPolygon.html#volume" target="_self">volume</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Volume. The volume is actually equivalent to this shape's area (SiMS is in 2D)
-   and is used with this shape's density to calculate its mass.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Values and Variables inherited from <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/dynamics/Shape.html#uid" target="_self">uid</a>, <a href="../../sims/dynamics/Shape.html#collidable" target="_self">collidable</a>, <a href="../../sims/dynamics/Shape.html#restitution" target="_self">restitution</a>, <a href="../../sims/dynamics/Shape.html#friction" target="_self">friction</a>, <a href="../../sims/dynamics/Shape.html#pos" target="_self">pos</a>, <a href="../../sims/dynamics/Shape.html#rotation" target="_self">rotation</a>, <a href="../../sims/dynamics/Shape.html#rotation0" target="_self">rotation0</a>, <a href="../../sims/dynamics/Shape.html#refLocalPos" target="_self">refLocalPos</a>, <a href="../../sims/dynamics/Shape.html#transientShapes" target="_self">transientShapes</a>
-        </td></tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/RegularPolygon.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/RegularPolygon.html#halfDiags" target="_self">halfDiags</a></em>
-         : <a href="" target="contentFrame" class="scala/Array">scala.Array</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/RegularPolygon.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/RegularPolygon.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/RegularPolygon.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/RegularPolygon.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/RegularPolygon.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/RegularPolygon.html#vertices" target="_self">vertices</a></em>
-         : <a href="" target="contentFrame" class="scala/Array">scala.Array</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]
-        
-        <div>Returns positions of all vertices of this Polygon. Vertices are ordered counter-clockwise.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/geometry/ConvexPolygon.html#sides" target="_self">sides</a>, <a href="../../sims/geometry/ConvexPolygon.html#project%28sims.geometry.Vector2D%29" target="_self">project</a>, <a href="../../sims/geometry/ConvexPolygon.html#AABB" target="_self">AABB</a>, <a href="../../sims/geometry/ConvexPolygon.html#contains%28sims.geometry.Vector2D%29" target="_self">contains</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="../../sims/dynamics/Shape.html#mass" target="_self">mass</a>, <a href="../../sims/dynamics/Shape.html#body" target="_self">body</a>, <a href="../../sims/dynamics/Shape.html#asBody" target="_self">asBody</a>, <a href="../../sims/dynamics/Shape.html#%7E%28sims.dynamics.Shape%29" target="_self">~</a>, <a href="../../sims/dynamics/Shape.html#%7E%28sims.dynamics.Body%29" target="_self">~</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>RegularPolygon</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">RegularPolygon</span><span class="params">(<span name="n">n: <span class="extype" name="scala.Int">Int</span></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>, <span name="density">density: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result"> extends <a href="Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a> with <a href="../geometry/ConvexPolygon.html" class="extype" name="sims.geometry.ConvexPolygon">ConvexPolygon</a> with <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>A regular polygon with <code>n</code> sides whose excircle has a radius <code>radius</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">n</dt><dd class="cmt"><p>nmber of sides.</p></dd><dt class="param">radius</dt><dd class="cmt"><p>radius of the excircle</p></dd><dt class="param">density</dt><dd class="cmt"><p>density of this regular polygon</p></dd></dl>
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="volume"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>volume</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Volume. The volume is actually equivalent to this shape's area (SiMS is in 2D)
-   and is used with this shape's density to calculate its mass.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>.<a href="../../sims/dynamics/Shape.html#volume" target="_self">volume</a>
-        </dd>
-      </dl><hr></hr>
-<a name="I"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>I</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Moment of inertia for a rotation about this shape's COM.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>.<a href="../../sims/dynamics/Shape.html#I" target="_self">I</a>
-        </dd>
-      </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="halfDiags"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>halfDiags</em> : <a href="" target="contentFrame" class="scala/Array">scala.Array</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="vertices"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>vertices</em> : <a href="" target="contentFrame" class="scala/Array">scala.Array</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns positions of all vertices of this Polygon. Vertices are ordered counter-clockwise.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>position vectors of the vertices</dd></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a>.<a href="../../sims/geometry/ConvexPolygon.html#vertices" target="_self">vertices</a>
-        </dd>
-      </dl><hr></hr>
-<a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
+      
+      <div class="block">
+                known subclasses: <a href="../../graphyx/graphics/GraphicalRegularPolygon.html">GraphicalRegularPolygon</a>
+              </div>
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="sims.geometry.ConvexPolygon">ConvexPolygon</li><li class="in" name="sims.dynamics.Shape">Shape</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.geometry.ConvexPolygon#AABB">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">AABB</span><span class="result">: <a href="../collision/AABB.html" class="extype" name="sims.collision.AABB">AABB</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns this polygon's axis aligned bounding box</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns this polygon's axis aligned bounding box.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../geometry/ConvexPolygon.html">ConvexPolygon</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.RegularPolygon#I">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">I</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Moment of inertia for a rotation about this shape's COM</p><div class="fullcomment">
+      <div class="comment cmt"><p>Moment of inertia for a rotation about this shape's COM.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#asBody">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">asBody</span><span class="result">: <a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Creates a new body made out of tis shape</p><div class="fullcomment">
+      <div class="comment cmt"><p>Creates a new body made out of tis shape.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#body">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">body</span><span class="result">: <a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns this shape's containing body</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns this shape's containing body.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.RegularPolygon#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Shape#collidable">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">collidable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Flag determining this shapes ability to collide with other shapes</p><div class="fullcomment">
+      <div class="comment cmt"><p>Flag determining this shapes ability to collide with other shapes.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.geometry.ConvexPolygon#contains">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">contains</span><span class="params">(<span name="point">point: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Checks if the point <code>point</code> is contained in this polygon</p><div class="fullcomment">
+      <div class="comment cmt"><p>Checks if the point <code>point</code> is contained in this polygon.
+<p>
+A ray is created, originating from the point and following an arbitrary direction (X-Axis was chosen).
+The number of intersections between the ray and this polygon's sides (including vertices) is counted.
+The amount of intersections with vertices is substracted form the previuos number.
+If the latter number is odd, the point is contained in the polygon.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../geometry/ConvexPolygon.html">ConvexPolygon</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.RegularPolygon#density">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">density</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Density</p><div class="fullcomment">
+      <div class="comment cmt"><p>Density. (Mass per area)</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.RegularPolygon#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#friction">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">friction</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Part of the coefficient of friction for a collision between this shape and another</p><div class="fullcomment">
+      <div class="comment cmt"><p>Part of the coefficient of friction for a collision between this shape and another.
+The coefficient of friction is calculated out of the product of this part and the other shape's part.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.RegularPolygon#halfDiags">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">halfDiags</span><span class="result">: <span class="extype" name="scala.Array">Array</span>[<a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.RegularPolygon#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#mass">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">mass</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the mass of this shape</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the mass of this shape. The mass is given by volume times density.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.RegularPolygon#n">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">n</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Shape#pos">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">pos</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Position of this shape's COM (in world coordinates)</p><div class="fullcomment">
+      <div class="comment cmt"><p>Position of this shape's COM (in world coordinates).</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.RegularPolygon#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.RegularPolygon#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.RegularPolygon#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.ConvexPolygon#project">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">project</span><span class="params">(<span name="axis">axis: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <a href="../geometry/Projection.html" class="extype" name="sims.geometry.Projection">Projection</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the projection of this polygon onto the line given by the directional vector <code>axis</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the projection of this polygon onto the line given by the directional vector <code>axis</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">axis</dt><dd class="cmt"><p>directional vector of the line</p></dd><dt>returns</dt><dd class="cmt"><p>projection of this polygon</p></dd></dl>
+      
+      <div class="block">
+            definition classes: <a href="../geometry/ConvexPolygon.html">ConvexPolygon</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.RegularPolygon#radius">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">radius</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Shape#refLocalPos">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">refLocalPos</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Local position of this shape's body COM to its COM at a body rotation of zero</p><div class="fullcomment">
+      <div class="comment cmt"><p>Local position of this shape's body COM to its COM at a body rotation of zero.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#restitution">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">restitution</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Part of the coefficient of restitution for a collision between this shape and another</p><div class="fullcomment">
+      <div class="comment cmt"><p>Part of the coefficient of restitution for a collision between this shape and another.
+The coefficient of restitution is calculated out of the product of this part and the other shape's part.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#rotation">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">rotation</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Rotation of this shape about its COM</p><div class="fullcomment">
+      <div class="comment cmt"><p>Rotation of this shape about its COM.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#rotation0">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">rotation0</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Initial rotation</p><div class="fullcomment">
+      <div class="comment cmt"><p>Initial rotation. Rotation of this shape before it was added to a body.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.geometry.ConvexPolygon#sides">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">sides</span><span class="result">: <span class="extype" name="scala.Array">Array</span>[<a href="../geometry/Segment.html" class="extype" name="sims.geometry.Segment">Segment</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns all sides of this polygon</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns all sides of this polygon. The sides are ordered counter-clockwise, the first vertex of the side
+giving the side index.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="../geometry/ConvexPolygon.html">ConvexPolygon</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.RegularPolygon#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#transientShapes">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">transientShapes</span><span class="result">: <span class="extype" name="scala.collection.mutable.Set">Set</span>[<a href="Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Shapes with which this shape cannot collide</p><div class="fullcomment">
+      <div class="comment cmt"><p>Shapes with which this shape cannot collide.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#uid">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">uid</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Unique identification number</p><div class="fullcomment">
+      <div class="comment cmt"><p>Unique identification number.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.RegularPolygon#vertices">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">vertices</span><span class="result">: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns positions of all vertices of this Polygon</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns positions of all vertices of this Polygon. Vertices are ordered counter-clockwise.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.RegularPolygon#volume">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">volume</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Volume</p><div class="fullcomment">
+      <div class="comment cmt"><p>Volume. The volume is actually equivalent to this shape's area (SiMS is in 2D)
+and is used with this shape's density to calculate its mass.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#~">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">~</span><span class="params">(<span name="b">b: <a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>)</span><span class="result">: <a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Creates a new body out of this shape and the shapes of body <code>b</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Creates a new body out of this shape and the shapes of body <code>b</code>.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#~">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">~</span><span class="params">(<span name="s">s: <a href="Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>)</span><span class="result">: <a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Creates a new body out of this shape and the shape <code>s</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Creates a new body out of this shape and the shape <code>s</code>.</p></div>
+      
+      
+      <div class="block">
+            definition classes: <a href="Shape.html">Shape</a>
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.dynamics.RegularPolygon#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">RegularPolygon</span><span class="params">(<span name="n">n: <span class="extype" name="scala.Int">Int</span></span>, <span name="radius">radius: <span class="extype" name="scala.Double">Double</span></span>, <span name="density">density: <span class="extype" name="scala.Double">Double</span></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.Shape#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">RegularPolygon</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/Shape$.html b/doc/sims/dynamics/Shape$.html
new file mode 100644
index 0000000..6cc92c5
--- /dev/null
+++ b/doc/sims/dynamics/Shape$.html
@@ -0,0 +1,148 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for sims.dynamics.Shape</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">dynamics</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>Shape</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Shape</span><span class="result"> extends AnyRef</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/Shape$object.html b/doc/sims/dynamics/Shape$object.html
deleted file mode 100644
index a90e5ee..0000000
--- a/doc/sims/dynamics/Shape$object.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Shape in sims.dynamics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/dynamics$package.html" target="_self">sims.dynamics</a>
-        <br></br>
-        <span class="entity">object  Shape</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/dynamics/Shape"><code>sims/dynamics/Shape.scala</code></a>]
-      </div><hr></hr>
-      <a name="Shape"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Shape</em>
-      </dt>
-      <dd><code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/Shape.html b/doc/sims/dynamics/Shape.html
index f769f9b..03db5e1 100644
--- a/doc/sims/dynamics/Shape.html
+++ b/doc/sims/dynamics/Shape.html
@@ -1,557 +1,458 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class Shape in sims.dynamics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for sims.dynamics.Shape</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/dynamics$package.html" target="_self">sims.dynamics</a>
-        <br></br>
-        <span class="entity">class  Shape</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/dynamics/Shape"><code>sims/dynamics/Shape.scala</code></a>]
-      </div><hr></hr>
-      <a name="Shape"></a><dl>
-      <dt>
-        
-        <code>abstract</code>
-        <code>class</code>
-        <em>Shape</em>
-      </dt>
-      <dd><code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a></dd>
-    </dl>
-      <dl><dd>An abstract shape.</dd></dl>
-      <dl></dl>
-    <dl>
-      <dt style="margin:10px 0 0 20px;"><b>Direct Known Subclasses:</b></dt>
-      <dd><a href="../../graphyx/graphics/GraphicalShape.html" target="_self">GraphicalShape</a>, <a href="../../sims/dynamics/Circle.html" target="_self">Circle</a>, <a href="../../sims/dynamics/Rectangle.html" target="_self">Rectangle</a>, <a href="../../sims/dynamics/RegularPolygon.html" target="_self">RegularPolygon</a></dd>
-      </dl><hr></hr>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">dynamics</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Shape.html#I" target="_self">I</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Moment of inertia for a rotation about this shape's COM.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Shape.html#collidable" target="_self">collidable</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>Flag determining this shapes ability to collide with other shapes.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Shape.html#density" target="_self">density</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Density. (Mass per area)</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Shape.html#friction" target="_self">friction</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Part of the coefficient of friction for a collision between this shape and another.
-   The coefficient of friction is calculated out of the product of this part and the other shape's part.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Shape.html#pos" target="_self">pos</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Position of this shape's COM (in world coordinates).</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Shape.html#refLocalPos" target="_self">refLocalPos</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Local position of this shape's body COM to its COM at a body rotation of zero.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Shape.html#restitution" target="_self">restitution</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Part of the coefficient of restitution for a collision between this shape and another.
-   The coefficient of restitution is calculated out of the product of this part and the other shape's part.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Shape.html#rotation" target="_self">rotation</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Rotation of this shape about its COM.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Shape.html#rotation0" target="_self">rotation0</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Initial rotation. Rotation of this shape before it was added to a body.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Shape.html#transientShapes" target="_self">transientShapes</a></em>
-         : <a href="" target="contentFrame" class="scala/collection/mutable/Set">scala.collection.mutable.Set</a>[<a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>]
-        
-        <div>Shapes with which this shape cannot collide.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Shape.html#uid" target="_self">uid</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Unique identification number.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Shape.html#volume" target="_self">volume</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Volume. The volume is actually equivalent to this shape's area (SiMS is in 2D)
-   and is used with this shape's density to calculate its mass.</div>
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Shape.html#AABB" target="_self">AABB</a></em>
-         : <a href="../../sims/collision/AABB.html" target="_self">AABB</a>
-        
-        <div>Returns this shape's axis aligned bounding box.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Shape.html#asBody" target="_self">asBody</a></em>
-         : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        <div>Creates a new body made out of tis shape.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Shape.html#body" target="_self">body</a></em>
-         : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        <div>Returns this shape's containing body.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Shape.html#contains%28sims.geometry.Vector2D%29" target="_self">contains</a></em>
-        (<em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>Checks if the point <code>point</code> is contained in this shape.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Shape.html#mass" target="_self">mass</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Returns the mass of this shape. The mass is given by volume times density.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Shape.html#project%28sims.geometry.Vector2D%29" target="_self">project</a></em>
-        (<em>axis</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/geometry/Projection.html" target="_self">Projection</a>
-        
-        <div>Returns the projection of this shape onto the line given by the directional vector <code>axis</code>.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Shape.html#%7E%28sims.dynamics.Body%29" target="_self">~</a></em>
-        (<em>b</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>) : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        <div>Creates a new body out of this shape and the shapes of body <code>b</code>.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/Shape.html#%7E%28sims.dynamics.Shape%29" target="_self">~</a></em>
-        (<em>s</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>) : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        <div>Creates a new body out of this shape and the shape <code>s</code>.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>Shape</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Shape</span><span class="result"> extends AnyRef</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>An abstract shape.</p></div>
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="uid"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>uid</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Unique identification number.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="collidable"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>collidable</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Flag determining this shapes ability to collide with other shapes.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="restitution"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>restitution</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Part of the coefficient of restitution for a collision between this shape and another.
-   The coefficient of restitution is calculated out of the product of this part and the other shape's part.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="friction"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>friction</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Part of the coefficient of friction for a collision between this shape and another.
-   The coefficient of friction is calculated out of the product of this part and the other shape's part.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="pos"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>pos</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Position of this shape's COM (in world coordinates).</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="rotation"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>rotation</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Rotation of this shape about its COM.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="rotation0"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>rotation0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Initial rotation. Rotation of this shape before it was added to a body.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="refLocalPos"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>refLocalPos</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Local position of this shape's body COM to its COM at a body rotation of zero.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="density"></a><dl>
-      <dt>
-        
-        <code>abstract</code>
-        <code>val</code>
-        <em>density</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Density. (Mass per area)</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="volume"></a><dl>
-      <dt>
-        
-        <code>abstract</code>
-        <code>val</code>
-        <em>volume</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Volume. The volume is actually equivalent to this shape's area (SiMS is in 2D)
-   and is used with this shape's density to calculate its mass.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="I"></a><dl>
-      <dt>
-        
-        <code>abstract</code>
-        <code>val</code>
-        <em>I</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Moment of inertia for a rotation about this shape's COM.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="transientShapes"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>transientShapes</em> : <a href="" target="contentFrame" class="scala/collection/mutable/Set">scala.collection.mutable.Set</a>[<a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>]
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Shapes with which this shape cannot collide.</dd></dl>
-      <dl></dl>
-    <hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="mass"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>mass</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns the mass of this shape. The mass is given by volume times density.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>mass of this shape</dd></dl>
-    <hr></hr>
-<a name="body"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>body</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns this shape's containing body.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="AABB"></a><dl>
-      <dt>
-        
-        <code>abstract</code>
-        <code>def</code>
-        <em>AABB</em> : <a href="../../sims/collision/AABB.html" target="_self">AABB</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns this shape's axis aligned bounding box.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="project%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code>abstract</code>
-        <code>def</code>
-        <em>project</em>(<em>axis</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/geometry/Projection.html" target="_self">Projection</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns the projection of this shape onto the line given by the directional vector <code>axis</code>.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>axis - </code>directional vector of the line</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>projection of this shape</dd></dl>
-    <hr></hr>
-<a name="contains%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code>abstract</code>
-        <code>def</code>
-        <em>contains</em>(<em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Checks if the point <code>point</code> is contained in this shape.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="asBody"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>asBody</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Creates a new body made out of tis shape.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a body made out of tis shape</dd></dl>
-    <hr></hr>
-<a name="%7E%28sims.dynamics.Shape%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>~</em>(<em>s</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>) : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Creates a new body out of this shape and the shape <code>s</code>.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="%7E%28sims.dynamics.Body%29"></a><dl>
-      <dt>
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      <div class="block">
+                known subclasses: <a href="RegularPolygon.html">RegularPolygon</a>, <a href="Rectangle.html">Rectangle</a>, <a href="Circle.html">Circle</a>, <a href="../../graphyx/graphics/GraphicalShape.html">GraphicalShape</a>
+              </div>
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.dynamics.Shape#AABB">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">AABB</span><span class="result">: <a href="../collision/AABB.html" class="extype" name="sims.collision.AABB">AABB</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns this shape's axis aligned bounding box</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns this shape's axis aligned bounding box.</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#I">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">I</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Moment of inertia for a rotation about this shape's COM</p><div class="fullcomment">
+      <div class="comment cmt"><p>Moment of inertia for a rotation about this shape's COM.</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#asBody">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">asBody</span><span class="result">: <a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Creates a new body made out of tis shape</p><div class="fullcomment">
+      <div class="comment cmt"><p>Creates a new body made out of tis shape.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#body">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">body</span><span class="result">: <a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns this shape's containing body</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns this shape's containing body.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#collidable">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">collidable</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Flag determining this shapes ability to collide with other shapes</p><div class="fullcomment">
+      <div class="comment cmt"><p>Flag determining this shapes ability to collide with other shapes.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#contains">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">contains</span><span class="params">(<span name="point">point: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Checks if the point <code>point</code> is contained in this shape</p><div class="fullcomment">
+      <div class="comment cmt"><p>Checks if the point <code>point</code> is contained in this shape.</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#density">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">density</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Density</p><div class="fullcomment">
+      <div class="comment cmt"><p>Density. (Mass per area)</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#friction">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">friction</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Part of the coefficient of friction for a collision between this shape and another</p><div class="fullcomment">
+      <div class="comment cmt"><p>Part of the coefficient of friction for a collision between this shape and another.
+The coefficient of friction is calculated out of the product of this part and the other shape's part.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#mass">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">mass</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the mass of this shape</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the mass of this shape. The mass is given by volume times density.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#pos">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">pos</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Position of this shape's COM (in world coordinates)</p><div class="fullcomment">
+      <div class="comment cmt"><p>Position of this shape's COM (in world coordinates).</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#project">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">project</span><span class="params">(<span name="axis">axis: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <a href="../geometry/Projection.html" class="extype" name="sims.geometry.Projection">Projection</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the projection of this shape onto the line given by the directional vector <code>axis</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the projection of this shape onto the line given by the directional vector <code>axis</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">axis</dt><dd class="cmt"><p>directional vector of the line</p></dd><dt>returns</dt><dd class="cmt"><p>projection of this shape</p></dd></dl>
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#refLocalPos">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">refLocalPos</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Local position of this shape's body COM to its COM at a body rotation of zero</p><div class="fullcomment">
+      <div class="comment cmt"><p>Local position of this shape's body COM to its COM at a body rotation of zero.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#restitution">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">restitution</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Part of the coefficient of restitution for a collision between this shape and another</p><div class="fullcomment">
+      <div class="comment cmt"><p>Part of the coefficient of restitution for a collision between this shape and another.
+The coefficient of restitution is calculated out of the product of this part and the other shape's part.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#rotation">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">rotation</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Rotation of this shape about its COM</p><div class="fullcomment">
+      <div class="comment cmt"><p>Rotation of this shape about its COM.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#rotation0">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">rotation0</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Initial rotation</p><div class="fullcomment">
+      <div class="comment cmt"><p>Initial rotation. Rotation of this shape before it was added to a body.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#transientShapes">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">transientShapes</span><span class="result">: <span class="extype" name="scala.collection.mutable.Set">Set</span>[<a href="" class="extype" name="sims.dynamics.Shape">Shape</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Shapes with which this shape cannot collide</p><div class="fullcomment">
+      <div class="comment cmt"><p>Shapes with which this shape cannot collide.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#uid">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">uid</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Unique identification number</p><div class="fullcomment">
+      <div class="comment cmt"><p>Unique identification number.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#volume">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">volume</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Volume</p><div class="fullcomment">
+      <div class="comment cmt"><p>Volume. The volume is actually equivalent to this shape's area (SiMS is in 2D)
+and is used with this shape's density to calculate its mass.</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#~">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">~</span><span class="params">(<span name="b">b: <a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>)</span><span class="result">: <a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Creates a new body out of this shape and the shapes of body <code>b</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Creates a new body out of this shape and the shapes of body <code>b</code>.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.Shape#~">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">~</span><span class="params">(<span name="s">s: <a href="" class="extype" name="sims.dynamics.Shape">Shape</a></span>)</span><span class="result">: <a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Creates a new body out of this shape and the shape <code>s</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Creates a new body out of this shape and the shape <code>s</code>.</p></div>
+      
+      
+      
+      
+    </div>
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.dynamics.Shape#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Shape</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>~</em>(<em>b</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>) : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Creates a new body out of this shape and the shapes of body <code>b</code>.</dd></dl>
-      <dl></dl>
-    <hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/World.html b/doc/sims/dynamics/World.html
index d089cd9..336852c 100644
--- a/doc/sims/dynamics/World.html
+++ b/doc/sims/dynamics/World.html
@@ -1,699 +1,539 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class World in sims.dynamics</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/dynamics$package.html" target="_self">sims.dynamics</a>
-        <br></br>
-        <span class="entity">class  World</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/dynamics/World"><code>sims/dynamics/World.scala</code></a>]
-      </div><hr></hr>
-      <a name="World"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>class</code>
-        <em>World</em>
-      </dt>
-      <dd><code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a></dd>
-    </dl>
-      <dl><dd>A world contains and simulates a system of rigid bodies and joints.</dd></dl>
-      <dl></dl>
+        <head>
+          <title>Scaladoc for sims.dynamics.World</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
     
+        </head>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">dynamics</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/World.html#bodies" target="_self">bodies</a></em>
-         : <a href="" target="contentFrame" class="scala/collection/mutable/ArrayBuffer">scala.collection.mutable.ArrayBuffer</a>[<a href="../../sims/dynamics/Body.html" target="_self">Body</a>]
-        
-        <div>Bodies contained in this world.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/World.html#detector" target="_self">detector</a></em>
-         : <a href="../../sims/collision/Detector.html" target="_self">Detector</a>
-        
-        <div>Collsion detector who manages collision detection in this world.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/World.html#enableCollisionDetection" target="_self">enableCollisionDetection</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>Flag to enable collision detection.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/World.html#enablePositionCorrection" target="_self">enablePositionCorrection</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>Flag to enable position correction for constraints.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/World.html#gravity" target="_self">gravity</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Gravity in this world.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/World.html#iterations" target="_self">iterations</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Number of constraint corrections per time step.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/World.html#joints" target="_self">joints</a></em>
-         : <a href="" target="contentFrame" class="scala/collection/mutable/ArrayBuffer">scala.collection.mutable.ArrayBuffer</a>[<a href="../../sims/dynamics/joints/Joint.html" target="_self">Joint</a>]
-        
-        <div>Joints contained in this world.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/World.html#minAngularVelocity" target="_self">minAngularVelocity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Minimal, non-zero angular velocity.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/World.html#minLinearVelocity" target="_self">minLinearVelocity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Minimal, non-zero linear velocity.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/World.html#monitors" target="_self">monitors</a></em>
-         : <a href="" target="contentFrame" class="scala/collection/mutable/ArrayBuffer">scala.collection.mutable.ArrayBuffer</a>[(<a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>, (<a href="../../sims/dynamics/Body.html" target="_self">Body</a>) =&gt; <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>)]
-        
-        <div>Monitoring methods for bodies.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/World.html#overCWarning" target="_self">overCWarning</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>Warning if a body's velocity exceeds the speed of light.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/World.html#time" target="_self">time</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Current time in this world.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/World.html#timeStep" target="_self">timeStep</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Time intervals in which this world simulates.</div>
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/World.html#%2B%2B%3D%28Seq%5Bsims.dynamics.Body%5D%29" target="_self">++=</a></em>
-        (<em>bs</em> : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../sims/dynamics/Body.html" target="_self">Body</a>]) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Adds the given sequence of bodies to this world.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/World.html#%2B%3D%28sims.dynamics.Body%29" target="_self">+=</a></em>
-        (<em>body</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Adds the given body to this world.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/World.html#%2B%3D%28sims.prefabs.Prefab%29" target="_self">+=</a></em>
-        (<em>p</em> : <a href="../../sims/prefabs/Prefab.html" target="_self">Prefab</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Adds the given prefabricated system of bodies and joints to this world.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/World.html#%2B%3D%28sims.dynamics.joints.Joint%29" target="_self">+=</a></em>
-        (<em>joint</em> : <a href="../../sims/dynamics/joints/Joint.html" target="_self">Joint</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Adds the given joint to this world.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/World.html#--%3D%28Seq%5Bsims.dynamics.Body%5D%29" target="_self">--=</a></em>
-        (<em>bs</em> : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../sims/dynamics/Body.html" target="_self">Body</a>]) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Removes the given sequence of bodies from this world.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/World.html#-%3D%28sims.prefabs.Prefab%29" target="_self">-=</a></em>
-        (<em>p</em> : <a href="../../sims/prefabs/Prefab.html" target="_self">Prefab</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Removes the given prefabricated system of bodies and joints from this world.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/World.html#-%3D%28sims.dynamics.Body%29" target="_self">-=</a></em>
-        (<em>body</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Removes the given body from this world.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/World.html#-%3D%28sims.dynamics.joints.Joint%29" target="_self">-=</a></em>
-        (<em>joint</em> : <a href="../../sims/dynamics/joints/Joint.html" target="_self">Joint</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Removes the given joint from this world.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/World.html#clear%28%29" target="_self">clear</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Removes all bodies, joints and monitoring methods from this world.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/World.html#info" target="_self">info</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns information about this world.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/World.html#postStep%28%29" target="_self">postStep</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Initially empty method that is executed after each time step. This method
-   may be overriden to create custom behaviour in a world.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/World.html#shapes" target="_self">shapes</a></em>
-         : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>]
-        
-        <div>Returns all shapes of all bodies in this world.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/World.html#step%28%29" target="_self">step</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Simulates a time step of the duration <code>timeStep</code>.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>World</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">World</span><span class="result"> extends AnyRef</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>A world contains and simulates a system of rigid bodies and joints.</p></div>
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="timeStep"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>timeStep</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Time intervals in which this world simulates.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="iterations"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>iterations</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Number of constraint corrections per time step.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="gravity"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>gravity</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Gravity in this world.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="bodies"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>bodies</em> : <a href="" target="contentFrame" class="scala/collection/mutable/ArrayBuffer">scala.collection.mutable.ArrayBuffer</a>[<a href="../../sims/dynamics/Body.html" target="_self">Body</a>]
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Bodies contained in this world.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="joints"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>joints</em> : <a href="" target="contentFrame" class="scala/collection/mutable/ArrayBuffer">scala.collection.mutable.ArrayBuffer</a>[<a href="../../sims/dynamics/joints/Joint.html" target="_self">Joint</a>]
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Joints contained in this world.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="monitors"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>monitors</em> : <a href="" target="contentFrame" class="scala/collection/mutable/ArrayBuffer">scala.collection.mutable.ArrayBuffer</a>[(<a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>, (<a href="../../sims/dynamics/Body.html" target="_self">Body</a>) =&gt; <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>)]
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Monitoring methods for bodies.
-   <p>
-   The first element of the tuple is the method's title and the second the method.
-   Example usage: monitors += ("Y-Position", _.pos.y.toString)
-   This will calculate all bodies - whose <code>monitor</code> field is set to
-   <code>true</code> - second position components.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="detector"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>detector</em> : <a href="../../sims/collision/Detector.html" target="_self">Detector</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Collsion detector who manages collision detection in this world.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="overCWarning"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>overCWarning</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Warning if a body's velocity exceeds the speed of light.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="enableCollisionDetection"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>enableCollisionDetection</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Flag to enable collision detection.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="enablePositionCorrection"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>enablePositionCorrection</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Flag to enable position correction for constraints.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="minLinearVelocity"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>minLinearVelocity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Minimal, non-zero linear velocity.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="minAngularVelocity"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>minAngularVelocity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Minimal, non-zero angular velocity.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="time"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>time</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Current time in this world.</dd></dl>
-      <dl></dl>
-    <hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="shapes"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>shapes</em> : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>]
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns all shapes of all bodies in this world.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="%2B%3D%28sims.dynamics.Body%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>+=</em>(<em>body</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Adds the given body to this world.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="%2B%3D%28sims.dynamics.joints.Joint%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>+=</em>(<em>joint</em> : <a href="../../sims/dynamics/joints/Joint.html" target="_self">Joint</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Adds the given joint to this world.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="%2B%3D%28sims.prefabs.Prefab%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>+=</em>(<em>p</em> : <a href="../../sims/prefabs/Prefab.html" target="_self">Prefab</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Adds the given prefabricated system of bodies and joints to this world.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="%2B%2B%3D%28Seq%5Bsims.dynamics.Body%5D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>++=</em>(<em>bs</em> : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../sims/dynamics/Body.html" target="_self">Body</a>]) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Adds the given sequence of bodies to this world.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="-%3D%28sims.dynamics.Body%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>-=</em>(<em>body</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Removes the given body from this world.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="-%3D%28sims.dynamics.joints.Joint%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>-=</em>(<em>joint</em> : <a href="../../sims/dynamics/joints/Joint.html" target="_self">Joint</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Removes the given joint from this world.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="-%3D%28sims.prefabs.Prefab%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>-=</em>(<em>p</em> : <a href="../../sims/prefabs/Prefab.html" target="_self">Prefab</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Removes the given prefabricated system of bodies and joints from this world.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="--%3D%28Seq%5Bsims.dynamics.Body%5D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>--=</em>(<em>bs</em> : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../sims/dynamics/Body.html" target="_self">Body</a>]) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Removes the given sequence of bodies from this world.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="clear%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>clear</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Removes all bodies, joints and monitoring methods from this world.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="step%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>step</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Simulates a time step of the duration <code>timeStep</code>.
-   <p>
-   The time step is simulated in the following phases:
-   <ol>
-   <li>Forces are applied to bodies.</li>
-   <li>Accelerations are integrated.</li>
-   <li>Velocities are corrected.</li>
-   <li>Velocities are integrated.</li>
-   <li>Postions are corrected.</li>
-   <li>The method <code>postStep()</code> is executed.</li>
-   </ol></dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="postStep%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>postStep</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Initially empty method that is executed after each time step. This method
-   may be overriden to create custom behaviour in a world.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="info"></a><dl>
-      <dt>
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.dynamics.World#++=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">++=</span><span class="params">(<span name="bs">bs: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Adds the given sequence of bodies to this world</p><div class="fullcomment">
+      <div class="comment cmt"><p>Adds the given sequence of bodies to this world.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.World#+=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">+=</span><span class="params">(<span name="p">p: <a href="../prefabs/Prefab.html" class="extype" name="sims.prefabs.Prefab">Prefab</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Adds the given prefabricated system of bodies and joints to this world</p><div class="fullcomment">
+      <div class="comment cmt"><p>Adds the given prefabricated system of bodies and joints to this world.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.World#+=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">+=</span><span class="params">(<span name="joint">joint: <a href="joints/Joint.html" class="extype" name="sims.dynamics.joints.Joint">Joint</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Adds the given joint to this world</p><div class="fullcomment">
+      <div class="comment cmt"><p>Adds the given joint to this world.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.World#+=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">+=</span><span class="params">(<span name="body">body: <a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>)</span><span class="result">: <span class="extype" name="scala.collection.mutable.ArrayBuffer">ArrayBuffer</span>[<a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Adds the given body to this world</p><div class="fullcomment">
+      <div class="comment cmt"><p>Adds the given body to this world.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.World#--=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">--=</span><span class="params">(<span name="bs">bs: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Removes the given sequence of bodies from this world</p><div class="fullcomment">
+      <div class="comment cmt"><p>Removes the given sequence of bodies from this world.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.World#-=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">-=</span><span class="params">(<span name="p">p: <a href="../prefabs/Prefab.html" class="extype" name="sims.prefabs.Prefab">Prefab</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Removes the given prefabricated system of bodies and joints from this world</p><div class="fullcomment">
+      <div class="comment cmt"><p>Removes the given prefabricated system of bodies and joints from this world.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.World#-=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">-=</span><span class="params">(<span name="joint">joint: <a href="joints/Joint.html" class="extype" name="sims.dynamics.joints.Joint">Joint</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Removes the given joint from this world</p><div class="fullcomment">
+      <div class="comment cmt"><p>Removes the given joint from this world.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.World#-=">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">-=</span><span class="params">(<span name="body">body: <a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Removes the given body from this world</p><div class="fullcomment">
+      <div class="comment cmt"><p>Removes the given body from this world.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.World#bodies">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">bodies</span><span class="result">: <span class="extype" name="scala.collection.mutable.ArrayBuffer">ArrayBuffer</span>[<a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Bodies contained in this world</p><div class="fullcomment">
+      <div class="comment cmt"><p>Bodies contained in this world.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.World#clear">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">clear</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Removes all bodies, joints and monitoring methods from this world</p><div class="fullcomment">
+      <div class="comment cmt"><p>Removes all bodies, joints and monitoring methods from this world.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.World#detector">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">detector</span><span class="result">: <a href="../collision/Detector.html" class="extype" name="sims.collision.Detector">Detector</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Collsion detector who manages collision detection in this world</p><div class="fullcomment">
+      <div class="comment cmt"><p>Collsion detector who manages collision detection in this world.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.World#enableCollisionDetection">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">enableCollisionDetection</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Flag to enable collision detection</p><div class="fullcomment">
+      <div class="comment cmt"><p>Flag to enable collision detection.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.World#enablePositionCorrection">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">enablePositionCorrection</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Flag to enable position correction for constraints</p><div class="fullcomment">
+      <div class="comment cmt"><p>Flag to enable position correction for constraints.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.World#gravity">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">gravity</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Gravity in this world</p><div class="fullcomment">
+      <div class="comment cmt"><p>Gravity in this world.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.World#info">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">info</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns information about this world</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns information about this world.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.World#iterations">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">iterations</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Number of constraint corrections per time step</p><div class="fullcomment">
+      <div class="comment cmt"><p>Number of constraint corrections per time step.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.World#joints">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">joints</span><span class="result">: <span class="extype" name="scala.collection.mutable.ArrayBuffer">ArrayBuffer</span>[<a href="joints/Joint.html" class="extype" name="sims.dynamics.joints.Joint">Joint</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Joints contained in this world</p><div class="fullcomment">
+      <div class="comment cmt"><p>Joints contained in this world.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.World#minAngularVelocity">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">minAngularVelocity</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Minimal, non-zero angular velocity</p><div class="fullcomment">
+      <div class="comment cmt"><p>Minimal, non-zero angular velocity.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.World#minLinearVelocity">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">minLinearVelocity</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Minimal, non-zero linear velocity</p><div class="fullcomment">
+      <div class="comment cmt"><p>Minimal, non-zero linear velocity.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.World#monitors">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">monitors</span><span class="result">: <span class="extype" name="scala.collection.mutable.ArrayBuffer">ArrayBuffer</span>[(<span class="extype" name="java.lang.String">String</span>, (<a href="Body.html" class="extype" name="sims.dynamics.Body">Body</a>) ⇒ <span class="extype" name="scala.Any">Any</span>)]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Monitoring methods for bodies</p><div class="fullcomment">
+      <div class="comment cmt"><p>Monitoring methods for bodies.
+<p>
+The first element of the tuple is the method's title and the second the method.
+Example usage: monitors += ("Y-Position", _.pos.y.toString)
+This will calculate all bodies - whose <code>monitor</code> field is set to
+<code>true</code> - second position components.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.World#overCWarning">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">overCWarning</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Warning if a body's velocity exceeds the speed of light</p><div class="fullcomment">
+      <div class="comment cmt"><p>Warning if a body's velocity exceeds the speed of light.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.World#postStep">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">postStep</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Initially empty method that is executed after each time step</p><div class="fullcomment">
+      <div class="comment cmt"><p>Initially empty method that is executed after each time step. This method
+may be overriden to create custom behaviour in a world.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.World#shapes">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">shapes</span><span class="result">: <span class="extype" name="scala.collection.mutable.ArrayBuffer">ArrayBuffer</span>[<a href="Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns all shapes of all bodies in this world</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns all shapes of all bodies in this world.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.World#step">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">step</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Simulates a time step of the duration <code>timeStep</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Simulates a time step of the duration <code>timeStep</code>.
+<p>
+The time step is simulated in the following phases:
+<ol>
+<li>Forces are applied to bodies.</li>
+<li>Accelerations are integrated.</li>
+<li>Velocities are corrected.</li>
+<li>Velocities are integrated.</li>
+<li>Postions are corrected.</li>
+<li>The method <code>postStep()</code> is executed.</li>
+</ol></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.World#time">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">time</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Current time in this world</p><div class="fullcomment">
+      <div class="comment cmt"><p>Current time in this world.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.World#timeStep">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">timeStep</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Time intervals in which this world simulates</p><div class="fullcomment">
+      <div class="comment cmt"><p>Time intervals in which this world simulates.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.dynamics.World#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">World</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>info</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns information about this world.</dd></dl>
-      <dl></dl>
-    <hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/joints$content.html b/doc/sims/dynamics/joints$content.html
deleted file mode 100644
index 141c3e3..0000000
--- a/doc/sims/dynamics/joints$content.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>All classes and objects in sims.dynamics.joints</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()"><div class="page-title"><div>Simple Mechanics Simulator (SiMS) API</div></div><p><div>This document is the API specification for SiMS</div></p><table summary="" cellpadding="3" class="member">
-        <tr><td class="title" colspan="2">Class Summary</td></tr>
-        <tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/joints/DistanceJoint.html" target="_self">DistanceJoint</a></em>
-        (<code>val </code><em>node1</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>, <code>val </code><em>anchor1</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <code>val </code><em>node2</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>, <code>val </code><em>anchor2</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>)<code> extends </code><a href="../../sims/dynamics/joints/Joint.html" target="_self">Joint</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        <div>DistanceJoints keep their connection points at a constant distance.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> trait</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/joints/ForceJoint.html" target="_self">ForceJoint</a></em>
-        <code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        <div>A joint which can apply a force to its anchor bodies, thus adding or removing energy to the system.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/joints/Joint.html" target="_self">Joint</a></em>
-        <code> extends </code><a href="../../sims/dynamics/Constraint.html" target="_self">Constraint</a><code> with </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        <div>Joints constrain the movement of two bodies.
- Their implementation was inspired by Erin Catto's box2d.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/joints/RevoluteJoint.html" target="_self">RevoluteJoint</a></em>
-        (<code>val </code><em>node1</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>, <code>val </code><em>node2</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>, <code>val </code><em>anchor</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>)<code> extends </code><a href="../../sims/dynamics/joints/Joint.html" target="_self">Joint</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        <div>A revolute joint that connects two bodies at a singe point. Inspired from JBox2D.
- <b>Warning:</b> there are still several bugs with revolute joints, if they are between two free
- bodies and not connected at their respective COMs.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/joints/SpringJoint.html" target="_self">SpringJoint</a></em>
-        (<code>val </code><em>node1</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>, <code>val </code><em>anchor1</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <code>val </code><em>node2</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>, <code>val </code><em>anchor2</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <code>val </code><em>springConstant</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <code>val </code><em>initialLength</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>)<code> extends </code><a href="../../sims/dynamics/joints/Joint.html" target="_self">Joint</a><code> with </code><a href="../../sims/dynamics/joints/ForceJoint.html" target="_self">ForceJoint</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        <div>A spring obeying Hooke's law.</div>
-      </td>
-    </tr>        
-        </table>
-<table summary="" cellpadding="3" class="member">
-        <tr><td class="title" colspan="2">Object Summary</td></tr>
-        <tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/joints/DistanceJoint$object.html" target="_self">DistanceJoint</a></em>
-        <code> extends </code>(<a href="../../sims/dynamics/Body.html" target="_self">Body</a>, <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <a href="../../sims/dynamics/Body.html" target="_self">Body</a>, <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) =&gt; <a href="../../sims/dynamics/joints/DistanceJoint.html" target="_self">DistanceJoint</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/joints/RevoluteJoint$object.html" target="_self">RevoluteJoint</a></em>
-        <code> extends </code>(<a href="../../sims/dynamics/Body.html" target="_self">Body</a>, <a href="../../sims/dynamics/Body.html" target="_self">Body</a>, <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) =&gt; <a href="../../sims/dynamics/joints/RevoluteJoint.html" target="_self">RevoluteJoint</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/dynamics/joints/SpringJoint$object.html" target="_self">SpringJoint</a></em>
-        <code> extends </code>(<a href="../../sims/dynamics/Body.html" target="_self">Body</a>, <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <a href="../../sims/dynamics/Body.html" target="_self">Body</a>, <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) =&gt; <a href="../../sims/dynamics/joints/SpringJoint.html" target="_self">SpringJoint</a>
-        
-        
-      </td>
-    </tr>        
-        </table></body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/joints$package.html b/doc/sims/dynamics/joints$package.html
deleted file mode 100644
index dde0590..0000000
--- a/doc/sims/dynamics/joints$package.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>List of classes and objects in package sims.dynamics.joints</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()"><table summary="" class="navigation">
-          <tr><td class="navigation-links" valign="top">
-            <a href="../../sims/dynamics/joints$content.html" target="contentFrame">sims.dynamics.joints</a>
-          </td></tr>
-        </table><div><div class="kinds" id="Classes">Classes</div><ul class="list">
-        <li id="Classes_D"><a href="../../sims/dynamics/joints/DistanceJoint.html" target="contentFrame">DistanceJoint</a></li>
-<li id="Classes_F"><a href="../../sims/dynamics/joints/ForceJoint.html" target="contentFrame">ForceJoint</a></li>
-<li id="Classes_J"><a href="../../sims/dynamics/joints/Joint.html" target="contentFrame">Joint</a></li>
-<li id="Classes_R"><a href="../../sims/dynamics/joints/RevoluteJoint.html" target="contentFrame">RevoluteJoint</a></li>
-<li id="Classes_S"><a href="../../sims/dynamics/joints/SpringJoint.html" target="contentFrame">SpringJoint</a></li>
-        </ul>
-<div class="kinds" id="Objects">Objects</div><ul class="list">
-        <li id="Objects_D"><a href="../../sims/dynamics/joints/DistanceJoint$object.html" target="contentFrame">DistanceJoint</a></li>
-<li id="Objects_R"><a href="../../sims/dynamics/joints/RevoluteJoint$object.html" target="contentFrame">RevoluteJoint</a></li>
-<li id="Objects_S"><a href="../../sims/dynamics/joints/SpringJoint$object.html" target="contentFrame">SpringJoint</a></li>
-        </ul></div></body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/joints/DistanceJoint$object.html b/doc/sims/dynamics/joints/DistanceJoint$object.html
deleted file mode 100644
index e4121b3..0000000
--- a/doc/sims/dynamics/joints/DistanceJoint$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object DistanceJoint in sims.dynamics.joints</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../../sims/dynamics/joints$package.html" target="_self">sims.dynamics.joints</a>
-        <br></br>
-        <span class="entity">object  DistanceJoint</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/dynamics/joints/DistanceJoint"><code>sims/dynamics/joints/DistanceJoint.scala</code></a>]
-      </div><hr></hr>
-      <a name="DistanceJoint"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>DistanceJoint</em>
-      </dt>
-      <dd><code> extends </code>(<a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) =&gt; <a href="../../../sims/dynamics/joints/DistanceJoint.html" target="_self">DistanceJoint</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function4">scala.Function4</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function4">scala.Function4.toString</a>, <a href="#curry" target="contentFrame" class="scala/Function4">scala.Function4.curry</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/joints/DistanceJoint.html b/doc/sims/dynamics/joints/DistanceJoint.html
index bae5f5d..27e4e5c 100644
--- a/doc/sims/dynamics/joints/DistanceJoint.html
+++ b/doc/sims/dynamics/joints/DistanceJoint.html
@@ -1,481 +1,359 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class DistanceJoint in sims.dynamics.joints</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../../sims/dynamics/joints$package.html" target="_self">sims.dynamics.joints</a>
-        <br></br>
-        <span class="entity">class  DistanceJoint</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/dynamics/joints/DistanceJoint"><code>sims/dynamics/joints/DistanceJoint.scala</code></a>]
-      </div><hr></hr>
-      <a name="DistanceJoint"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>DistanceJoint</em>(<code>val </code><em>node1</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <code>val </code><em>anchor1</em> : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <code>val </code><em>node2</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <code>val </code><em>anchor2</em> : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>)
-      </dt>
-      <dd><code> extends </code><a href="../../../sims/dynamics/joints/Joint.html" target="_self">Joint</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
-      <dl><dd>DistanceJoints keep their connection points at a constant distance.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>node1 - </code>first associated body</dd><dd><code>anchor1 - </code>first connection point</dd><dd><code>node2 - </code>second associated body</dd><dd><code>anchor2 - </code>second connection point</dd></dl>
+        <head>
+          <title>Scaladoc for sims.dynamics.joints.DistanceJoint</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../../lib/template.js"></script>
     
-      <table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Additional Constructor Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/DistanceJoint.html#this%28sims.dynamics.Body%2Csims.dynamics.Body%29" target="_self">this</a></em>
-        (<em>node1</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <em>node2</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>) : <a href="../../../sims/dynamics/joints/DistanceJoint.html" target="_self">DistanceJoint</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/DistanceJoint.html#distance" target="_self">distance</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Distance between the two connection points at initialisation (the desired distance).</div>
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/DistanceJoint.html#connection1" target="_self">connection1</a></em>
-         : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Returns the connection point on body one (in world coordinates).</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/DistanceJoint.html#connection2" target="_self">connection2</a></em>
-         : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Returns the connection point on body two (in world coordinates).</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/DistanceJoint.html#correctPosition%28Double%29" target="_self">correctPosition</a></em>
-        (<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Corrects the positions of this joint's associated bodies.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/DistanceJoint.html#correctVelocity%28Double%29" target="_self">correctVelocity</a></em>
-        (<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Corrects the velocities of this joint's associated bodies.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/DistanceJoint.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/DistanceJoint.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/DistanceJoint.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/DistanceJoint.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/DistanceJoint.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/DistanceJoint.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/DistanceJoint.html#v" target="_self">v</a></em>
-         : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Relative velocity of the connection points.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/DistanceJoint.html#x" target="_self">x</a></em>
-         : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Relative position of the connection points.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      <table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Additional Constructor Details</td></tr>
-        </table><div><a name="this%28sims.dynamics.Body%2Csims.dynamics.Body%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>this</em>(<em>node1</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <em>node2</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>) : <a href="../../../sims/dynamics/joints/DistanceJoint.html" target="_self">DistanceJoint</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="distance"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>distance</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Distance between the two connection points at initialisation (the desired distance).</dd></dl>
-      <dl></dl>
-    <hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="connection1"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>connection1</em> : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns the connection point on body one (in world coordinates).</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="connection2"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>connection2</em> : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns the connection point on body two (in world coordinates).</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="x"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>x</em> : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Relative position of the connection points.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="v"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>v</em> : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Relative velocity of the connection points.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="correctVelocity%28Double%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>correctVelocity</em>(<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Corrects the velocities of this joint's associated bodies.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../../sims/dynamics/joints/Joint.html" target="_self">Joint</a>.<a href="../../../sims/dynamics/joints/Joint.html#correctVelocity%28Double%29" target="_self">correctVelocity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="correctPosition%28Double%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>correctPosition</em>(<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Corrects the positions of this joint's associated bodies.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../../sims/dynamics/joints/Joint.html" target="_self">Joint</a>.<a href="../../../sims/dynamics/joints/Joint.html#correctPosition%28Double%29" target="_self">correctPosition</a>
-        </dd>
-      </dl><hr></hr>
-<a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
+        </head>
+        <body class="type">
+      
+      <p id="owner"><a href="../../package.html">sims</a>.<a href="../package.html">dynamics</a>.<a href="package.html">joints</a></p>
 
+      <div id="definition">
+        <img src="../../../lib/class_big.png" />
+        <h1>DistanceJoint</h1>
+      </div>
 
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">DistanceJoint</span><span class="params">(<span name="node1">node1: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="anchor1">anchor1: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="node2">node2: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="anchor2">anchor2: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result"> extends <a href="Joint.html" class="extype" name="sims.dynamics.joints.Joint">Joint</a> with <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>DistanceJoints keep their connection points at a constant distance.</p></div>
+      <dl class="paramcmts block"><dt class="param">node1</dt><dd class="cmt"><p>first associated body</p></dd><dt class="param">anchor1</dt><dd class="cmt"><p>first connection point</p></dd><dt class="param">node2</dt><dd class="cmt"><p>second associated body</p></dd><dt class="param">anchor2</dt><dd class="cmt"><p>second connection point</p></dd></dl>
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="sims.dynamics.joints.Joint">Joint</li><li class="in" name="sims.dynamics.Constraint">Constraint</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.dynamics.joints.DistanceJoint#anchor1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">anchor1</span><span class="result">: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.DistanceJoint#anchor2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">anchor2</span><span class="result">: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.DistanceJoint#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.DistanceJoint#connection1">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">connection1</span><span class="result">: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the connection point on body one (in world coordinates)</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the connection point on body one (in world coordinates).</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.DistanceJoint#connection2">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">connection2</span><span class="result">: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the connection point on body two (in world coordinates)</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the connection point on body two (in world coordinates).</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.DistanceJoint#correctPosition">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctPosition</span><span class="params">(<span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Corrects the positions of this joint's associated bodies</p><div class="fullcomment">
+      <div class="comment cmt"><p>Corrects the positions of this joint's associated bodies.@param h a time interval, used for converting forces and impulses</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.DistanceJoint#correctVelocity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctVelocity</span><span class="params">(<span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Corrects the velocities of this joint's associated bodies</p><div class="fullcomment">
+      <div class="comment cmt"><p>Corrects the velocities of this joint's associated bodies.@param h a time interval, used for converting forces and impulses</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.DistanceJoint#distance">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">distance</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Distance between the two connection points at initialisation (the desired distance)</p><div class="fullcomment">
+      <div class="comment cmt"><p>Distance between the two connection points at initialisation (the desired distance).</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.DistanceJoint#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.DistanceJoint#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.DistanceJoint#node1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">node1</span><span class="result">: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">First body of the joint</p><div class="fullcomment">
+      <div class="comment cmt"><p>First body of the joint.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.DistanceJoint#node2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">node2</span><span class="result">: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Second body of the joint</p><div class="fullcomment">
+      <div class="comment cmt"><p>Second body of the joint.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.DistanceJoint#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.DistanceJoint#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.DistanceJoint#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.DistanceJoint#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.DistanceJoint#v">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">v</span><span class="result">: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Relative velocity of the connection points</p><div class="fullcomment">
+      <div class="comment cmt"><p>Relative velocity of the connection points.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.DistanceJoint#x">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">x</span><span class="result">: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Relative position of the connection points</p><div class="fullcomment">
+      <div class="comment cmt"><p>Relative position of the connection points.</p></div>
+      
+      
+      
+      
+    </div>
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.dynamics.joints.DistanceJoint#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">DistanceJoint</span><span class="params">(<span name="node1">node1: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="node2">node2: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.DistanceJoint#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">DistanceJoint</span><span class="params">(<span name="node1">node1: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="anchor1">anchor1: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="node2">node2: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="anchor2">anchor2: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.Joint#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">DistanceJoint</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/joints/ForceJoint.html b/doc/sims/dynamics/joints/ForceJoint.html
index 58215b4..76bfe45 100644
--- a/doc/sims/dynamics/joints/ForceJoint.html
+++ b/doc/sims/dynamics/joints/ForceJoint.html
@@ -1,107 +1,166 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>trait ForceJoint in sims.dynamics.joints</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../../script.js"></script>
+        <head>
+          <title>Scaladoc for sims.dynamics.joints.ForceJoint</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../../sims/dynamics/joints$package.html" target="_self">sims.dynamics.joints</a>
-        <br></br>
-        <span class="entity">trait  ForceJoint</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/dynamics/joints/ForceJoint"><code>sims/dynamics/joints/ForceJoint.scala</code></a>]
-      </div><hr></hr>
-      <a name="ForceJoint"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>trait</code>
-        <em>ForceJoint</em>
-      </dt>
-      <dd><code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a></dd>
-    </dl>
-      <dl><dd>A joint which can apply a force to its anchor bodies, thus adding or removing energy to the system.</dd></dl>
-      <dl></dl>
-    <dl>
-      <dt style="margin:10px 0 0 20px;"><b>Direct Known Subclasses:</b></dt>
-      <dd><a href="../../../sims/dynamics/joints/SpringJoint.html" target="_self">SpringJoint</a></dd>
-      </dl><hr></hr>
+        <body class="type">
       
+      <p id="owner"><a href="../../package.html">sims</a>.<a href="../package.html">dynamics</a>.<a href="package.html">joints</a></p>
 
+      <div id="definition">
+        <img src="../../../lib/trait_big.png" />
+        <h1>ForceJoint</h1>
+      </div>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/ForceJoint.html#applyForce%28%29" target="_self">applyForce</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
+      <h4 class="signature">
+      <span class="kind">trait</span>
+      <span class="symbol">
+        <span class="name">ForceJoint</span><span class="result"> extends AnyRef</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>A joint which can apply a force to its anchor bodies, thus adding or removing energy to the system.</p></div>
+      
+      
+      
+      <div class="block">
+                known subclasses: <a href="SpringJoint.html">SpringJoint</a>
+              </div>
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <div>Applies a force on the achor bodies.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.dynamics.joints.ForceJoint#applyForce">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">applyForce</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Applies a force on the achor bodies</p><div class="fullcomment">
+      <div class="comment cmt"><p>Applies a force on the achor bodies.</p></div>
       
-
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="applyForce%28%29"></a><dl>
-      <dt>
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code>abstract</code>
-        <code>def</code>
-        <em>applyForce</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Applies a force on the achor bodies.</dd></dl>
-      <dl></dl>
-    <hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+        
+        
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/joints/Joint.html b/doc/sims/dynamics/joints/Joint.html
index 0e6908f..4874434 100644
--- a/doc/sims/dynamics/joints/Joint.html
+++ b/doc/sims/dynamics/joints/Joint.html
@@ -1,194 +1,228 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class Joint in sims.dynamics.joints</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../../script.js"></script>
+        <head>
+          <title>Scaladoc for sims.dynamics.joints.Joint</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../../sims/dynamics/joints$package.html" target="_self">sims.dynamics.joints</a>
-        <br></br>
-        <span class="entity">class  Joint</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/dynamics/joints/Joint"><code>sims/dynamics/joints/Joint.scala</code></a>]
-      </div><hr></hr>
-      <a name="Joint"></a><dl>
-      <dt>
-        
-        <code>abstract</code>
-        <code>class</code>
-        <em>Joint</em>
-      </dt>
-      <dd><code> extends </code><a href="../../../sims/dynamics/Constraint.html" target="_self">Constraint</a><code> with </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a></dd>
-    </dl>
-      <dl><dd>Joints constrain the movement of two bodies.
- Their implementation was inspired by Erin Catto's box2d.</dd></dl>
-      <dl></dl>
-    <dl>
-      <dt style="margin:10px 0 0 20px;"><b>Direct Known Subclasses:</b></dt>
-      <dd><a href="../../../sims/dynamics/joints/DistanceJoint.html" target="_self">DistanceJoint</a>, <a href="../../../sims/dynamics/joints/RevoluteJoint.html" target="_self">RevoluteJoint</a>, <a href="../../../sims/dynamics/joints/SpringJoint.html" target="_self">SpringJoint</a>, <a href="../../../sims/dynamics/joints/test/PrismaticJoint.html" target="_self">PrismaticJoint</a>, <a href="../../../sims/dynamics/joints/test/UnitCircleJoint.html" target="_self">UnitCircleJoint</a></dd>
-      </dl><hr></hr>
+        <body class="type">
       
+      <p id="owner"><a href="../../package.html">sims</a>.<a href="../package.html">dynamics</a>.<a href="package.html">joints</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/Joint.html#node1" target="_self">node1</a></em>
-         : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        <div>First body of the joint.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/Joint.html#node2" target="_self">node2</a></em>
-         : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        <div>Second body of the joint.</div>
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/Joint.html#correctPosition%28Double%29" target="_self">correctPosition</a></em>
-        (<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Corrects the positions of this joint's associated bodies.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/Joint.html#correctVelocity%28Double%29" target="_self">correctVelocity</a></em>
-        (<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Corrects the velocities of this joint's associated bodies.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../../lib/class_big.png" />
+        <h1>Joint</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Joint</span><span class="result"> extends <a href="../Constraint.html" class="extype" name="sims.dynamics.Constraint">Constraint</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>Joints constrain the movement of two bodies.
+Their implementation was inspired by Erin Catto's box2d.</p></div>
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="node1"></a><dl>
-      <dt>
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      <div class="block">
+                known subclasses: <a href="test/UnitCircleJoint.html">UnitCircleJoint</a>, <a href="test/PrismaticJoint.html">PrismaticJoint</a>, <a href="SpringJoint.html">SpringJoint</a>, <a href="RevoluteJoint.html">RevoluteJoint</a>, <a href="DistanceJoint.html">DistanceJoint</a>
+              </div>
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="sims.dynamics.Constraint">Constraint</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
         
-        <code>abstract</code>
-        <code>val</code>
-        <em>node1</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>First body of the joint.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="node2"></a><dl>
-      <dt>
         
-        <code>abstract</code>
-        <code>val</code>
-        <em>node2</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Second body of the joint.</dd></dl>
-      <dl></dl>
-    <hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="correctVelocity%28Double%29"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.dynamics.joints.Joint#correctPosition">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctPosition</span><span class="params">(<span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Corrects the positions of this joint's associated bodies</p><div class="fullcomment">
+      <div class="comment cmt"><p>Corrects the positions of this joint's associated bodies.@param h a time interval, used for converting forces and impulses</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.Joint#correctVelocity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctVelocity</span><span class="params">(<span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Corrects the velocities of this joint's associated bodies</p><div class="fullcomment">
+      <div class="comment cmt"><p>Corrects the velocities of this joint's associated bodies.@param h a time interval, used for converting forces and impulses</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.joints.Joint#node1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">node1</span><span class="result">: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">First body of the joint</p><div class="fullcomment">
+      <div class="comment cmt"><p>First body of the joint.</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.Joint#node2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">node2</span><span class="result">: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Second body of the joint</p><div class="fullcomment">
+      <div class="comment cmt"><p>Second body of the joint.</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code>abstract</code>
-        <code>def</code>
-        <em>correctVelocity</em>(<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Corrects the velocities of this joint's associated bodies.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../../sims/dynamics/Constraint.html" target="_self">Constraint</a>.<a href="../../../sims/dynamics/Constraint.html#correctVelocity%28Double%29" target="_self">correctVelocity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="correctPosition%28Double%29"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.dynamics.joints.Joint#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Joint</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>abstract</code>
-        <code>def</code>
-        <em>correctPosition</em>(<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Corrects the positions of this joint's associated bodies.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../../sims/dynamics/Constraint.html" target="_self">Constraint</a>.<a href="../../../sims/dynamics/Constraint.html#correctPosition%28Double%29" target="_self">correctPosition</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/joints/RevoluteJoint$object.html b/doc/sims/dynamics/joints/RevoluteJoint$object.html
deleted file mode 100644
index c8a5d71..0000000
--- a/doc/sims/dynamics/joints/RevoluteJoint$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object RevoluteJoint in sims.dynamics.joints</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../../sims/dynamics/joints$package.html" target="_self">sims.dynamics.joints</a>
-        <br></br>
-        <span class="entity">object  RevoluteJoint</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/dynamics/joints/RevoluteJoint"><code>sims/dynamics/joints/RevoluteJoint.scala</code></a>]
-      </div><hr></hr>
-      <a name="RevoluteJoint"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>RevoluteJoint</em>
-      </dt>
-      <dd><code> extends </code>(<a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) =&gt; <a href="../../../sims/dynamics/joints/RevoluteJoint.html" target="_self">RevoluteJoint</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function3">scala.Function3</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function3">scala.Function3.toString</a>, <a href="#curry" target="contentFrame" class="scala/Function3">scala.Function3.curry</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/joints/RevoluteJoint.html b/doc/sims/dynamics/joints/RevoluteJoint.html
index 5184b29..921025a 100644
--- a/doc/sims/dynamics/joints/RevoluteJoint.html
+++ b/doc/sims/dynamics/joints/RevoluteJoint.html
@@ -1,421 +1,307 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class RevoluteJoint in sims.dynamics.joints</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../../sims/dynamics/joints$package.html" target="_self">sims.dynamics.joints</a>
-        <br></br>
-        <span class="entity">class  RevoluteJoint</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/dynamics/joints/RevoluteJoint"><code>sims/dynamics/joints/RevoluteJoint.scala</code></a>]
-      </div><hr></hr>
-      <a name="RevoluteJoint"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>RevoluteJoint</em>(<code>val </code><em>node1</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <code>val </code><em>node2</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <code>val </code><em>anchor</em> : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>)
-      </dt>
-      <dd><code> extends </code><a href="../../../sims/dynamics/joints/Joint.html" target="_self">Joint</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
-      <dl><dd>A revolute joint that connects two bodies at a singe point. Inspired from JBox2D.
- <b>Warning:</b> there are still several bugs with revolute joints, if they are between two free
- bodies and not connected at their respective COMs.</dd></dl>
-      <dl></dl>
+        <head>
+          <title>Scaladoc for sims.dynamics.joints.RevoluteJoint</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../../lib/template.js"></script>
     
+        </head>
+        <body class="type">
       
+      <p id="owner"><a href="../../package.html">sims</a>.<a href="../package.html">dynamics</a>.<a href="package.html">joints</a></p>
 
+      <div id="definition">
+        <img src="../../../lib/class_big.png" />
+        <h1>RevoluteJoint</h1>
+      </div>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/RevoluteJoint.html#connection1" target="_self">connection1</a></em>
-         : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/RevoluteJoint.html#connection2" target="_self">connection2</a></em>
-         : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/RevoluteJoint.html#correctPosition%28Double%29" target="_self">correctPosition</a></em>
-        (<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Corrects the positions of this joint's associated bodies.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/RevoluteJoint.html#correctVelocity%28Double%29" target="_self">correctVelocity</a></em>
-        (<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Corrects the velocities of this joint's associated bodies.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/RevoluteJoint.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/RevoluteJoint.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/RevoluteJoint.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/RevoluteJoint.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/RevoluteJoint.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/RevoluteJoint.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/RevoluteJoint.html#v" target="_self">v</a></em>
-         : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/RevoluteJoint.html#x" target="_self">x</a></em>
-         : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">RevoluteJoint</span><span class="params">(<span name="node1">node1: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="node2">node2: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="anchor">anchor: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result"> extends <a href="Joint.html" class="extype" name="sims.dynamics.joints.Joint">Joint</a> with <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>A revolute joint that connects two bodies at a singe point. Inspired from JBox2D.
+<b>Warning:</b> there are still several bugs with revolute joints, if they are between two free
+bodies and not connected at their respective COMs.</p></div>
       
-
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="connection1"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>connection1</em> : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="connection2"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>connection2</em> : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="x"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>x</em> : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="v"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>v</em> : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="correctVelocity%28Double%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>correctVelocity</em>(<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Corrects the velocities of this joint's associated bodies.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../../sims/dynamics/joints/Joint.html" target="_self">Joint</a>.<a href="../../../sims/dynamics/joints/Joint.html#correctVelocity%28Double%29" target="_self">correctVelocity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="correctPosition%28Double%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>correctPosition</em>(<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Corrects the positions of this joint's associated bodies.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../../sims/dynamics/joints/Joint.html" target="_self">Joint</a>.<a href="../../../sims/dynamics/joints/Joint.html#correctPosition%28Double%29" target="_self">correctPosition</a>
-        </dd>
-      </dl><hr></hr>
-<a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="sims.dynamics.joints.Joint">Joint</li><li class="in" name="sims.dynamics.Constraint">Constraint</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.dynamics.joints.RevoluteJoint#anchor">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">anchor</span><span class="result">: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.RevoluteJoint#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.RevoluteJoint#connection1">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">connection1</span><span class="result">: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.RevoluteJoint#connection2">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">connection2</span><span class="result">: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.RevoluteJoint#correctPosition">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctPosition</span><span class="params">(<span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Corrects the positions of this joint's associated bodies</p><div class="fullcomment">
+      <div class="comment cmt"><p>Corrects the positions of this joint's associated bodies.@param h a time interval, used for converting forces and impulses</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.RevoluteJoint#correctVelocity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctVelocity</span><span class="params">(<span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Corrects the velocities of this joint's associated bodies</p><div class="fullcomment">
+      <div class="comment cmt"><p>Corrects the velocities of this joint's associated bodies.@param h a time interval, used for converting forces and impulses</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.RevoluteJoint#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.RevoluteJoint#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.RevoluteJoint#node1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">node1</span><span class="result">: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">First body of the joint</p><div class="fullcomment">
+      <div class="comment cmt"><p>First body of the joint.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.RevoluteJoint#node2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">node2</span><span class="result">: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Second body of the joint</p><div class="fullcomment">
+      <div class="comment cmt"><p>Second body of the joint.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.RevoluteJoint#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.RevoluteJoint#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.RevoluteJoint#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.RevoluteJoint#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.RevoluteJoint#v">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">v</span><span class="result">: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.RevoluteJoint#x">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">x</span><span class="result">: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.dynamics.joints.RevoluteJoint#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">RevoluteJoint</span><span class="params">(<span name="node1">node1: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="node2">node2: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="anchor">anchor: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.Joint#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">RevoluteJoint</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/joints/SpringJoint$object.html b/doc/sims/dynamics/joints/SpringJoint$object.html
deleted file mode 100644
index 7730d19..0000000
--- a/doc/sims/dynamics/joints/SpringJoint$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object SpringJoint in sims.dynamics.joints</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../../sims/dynamics/joints$package.html" target="_self">sims.dynamics.joints</a>
-        <br></br>
-        <span class="entity">object  SpringJoint</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/dynamics/joints/SpringJoint"><code>sims/dynamics/joints/SpringJoint.scala</code></a>]
-      </div><hr></hr>
-      <a name="SpringJoint"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>SpringJoint</em>
-      </dt>
-      <dd><code> extends </code>(<a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) =&gt; <a href="../../../sims/dynamics/joints/SpringJoint.html" target="_self">SpringJoint</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function6">scala.Function6</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function6">scala.Function6.toString</a>, <a href="#curry" target="contentFrame" class="scala/Function6">scala.Function6.curry</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/joints/SpringJoint.html b/doc/sims/dynamics/joints/SpringJoint.html
index 4819b16..699f2e0 100644
--- a/doc/sims/dynamics/joints/SpringJoint.html
+++ b/doc/sims/dynamics/joints/SpringJoint.html
@@ -1,574 +1,419 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class SpringJoint in sims.dynamics.joints</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../../sims/dynamics/joints$package.html" target="_self">sims.dynamics.joints</a>
-        <br></br>
-        <span class="entity">class  SpringJoint</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/dynamics/joints/SpringJoint"><code>sims/dynamics/joints/SpringJoint.scala</code></a>]
-      </div><hr></hr>
-      <a name="SpringJoint"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>SpringJoint</em>(<code>val </code><em>node1</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <code>val </code><em>anchor1</em> : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <code>val </code><em>node2</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <code>val </code><em>anchor2</em> : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <code>val </code><em>springConstant</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <code>val </code><em>initialLength</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>)
-      </dt>
-      <dd><code> extends </code><a href="../../../sims/dynamics/joints/Joint.html" target="_self">Joint</a><code> with </code><a href="../../../sims/dynamics/joints/ForceJoint.html" target="_self">ForceJoint</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
-      <dl><dd>A spring obeying Hooke's law.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>node1 - </code>first associated body</dd><dd><code>anchor1 - </code>first connection point</dd><dd><code>node2 - </code>second associated body</dd><dd><code>anchor2 - </code>second connection point</dd><dd><code>springConstant - </code>spring constant</dd><dd><code>initialLength - </code>initial length</dd></dl>
+        <head>
+          <title>Scaladoc for sims.dynamics.joints.SpringJoint</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../../lib/template.js"></script>
     
-      <table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Additional Constructor Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/SpringJoint.html#this%28sims.dynamics.Body%2Csims.dynamics.Body%2CDouble%2CDouble%29" target="_self">this</a></em>
-        (<em>node1</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <em>node2</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <em>springConstant</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <em>initialLength</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="../../../sims/dynamics/joints/SpringJoint.html" target="_self">SpringJoint</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/SpringJoint.html#this%28sims.dynamics.Body%2Csims.geometry.Vector2D%2Csims.dynamics.Body%2Csims.geometry.Vector2D%2CDouble%29" target="_self">this</a></em>
-        (<em>node1</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <em>anchor1</em> : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <em>node2</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <em>anchor2</em> : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <em>springConstant</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="../../../sims/dynamics/joints/SpringJoint.html" target="_self">SpringJoint</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/SpringJoint.html#this%28sims.dynamics.Body%2Csims.dynamics.Body%2CDouble%29" target="_self">this</a></em>
-        (<em>node1</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <em>node2</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <em>springConstant</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="../../../sims/dynamics/joints/SpringJoint.html" target="_self">SpringJoint</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> var</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/SpringJoint.html#damping" target="_self">damping</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Damping.</div>
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/SpringJoint.html#applyForce%28%29" target="_self">applyForce</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Applies the spring force to the connection points.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/SpringJoint.html#connection1" target="_self">connection1</a></em>
-         : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Returns the connection point on body one (in world coordinates).</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/SpringJoint.html#connection2" target="_self">connection2</a></em>
-         : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Returns the connection point on body two (in world coordinates).</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/SpringJoint.html#correctPosition%28Double%29" target="_self">correctPosition</a></em>
-        (<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Corrects the positions of this joint's associated bodies.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/SpringJoint.html#correctVelocity%28Double%29" target="_self">correctVelocity</a></em>
-        (<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Corrects the velocities of this joint's associated bodies.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/SpringJoint.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/SpringJoint.html#force" target="_self">force</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Returns the spring force.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/SpringJoint.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/SpringJoint.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/SpringJoint.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/SpringJoint.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/SpringJoint.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/SpringJoint.html#v" target="_self">v</a></em>
-         : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Relative velocity of the connection points.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/SpringJoint.html#x" target="_self">x</a></em>
-         : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Relative position of the connection points.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      <table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Additional Constructor Details</td></tr>
-        </table><div><a name="this%28sims.dynamics.Body%2Csims.geometry.Vector2D%2Csims.dynamics.Body%2Csims.geometry.Vector2D%2CDouble%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>this</em>(<em>node1</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <em>anchor1</em> : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <em>node2</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <em>anchor2</em> : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <em>springConstant</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="../../../sims/dynamics/joints/SpringJoint.html" target="_self">SpringJoint</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="this%28sims.dynamics.Body%2Csims.dynamics.Body%2CDouble%2CDouble%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>this</em>(<em>node1</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <em>node2</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <em>springConstant</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <em>initialLength</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="../../../sims/dynamics/joints/SpringJoint.html" target="_self">SpringJoint</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="this%28sims.dynamics.Body%2Csims.dynamics.Body%2CDouble%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>this</em>(<em>node1</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <em>node2</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <em>springConstant</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="../../../sims/dynamics/joints/SpringJoint.html" target="_self">SpringJoint</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="damping"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>var</code>
-        <em>damping</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Damping.</dd></dl>
-      <dl></dl>
-    <hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="connection1"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>connection1</em> : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns the connection point on body one (in world coordinates).</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="connection2"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>connection2</em> : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns the connection point on body two (in world coordinates).</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="x"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>x</em> : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Relative position of the connection points.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="v"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>v</em> : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Relative velocity of the connection points.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="force"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>force</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns the spring force.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="applyForce%28%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>applyForce</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Applies the spring force to the connection points.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../../sims/dynamics/joints/ForceJoint.html" target="_self">ForceJoint</a>.<a href="../../../sims/dynamics/joints/ForceJoint.html#applyForce%28%29" target="_self">applyForce</a>
-        </dd>
-      </dl><hr></hr>
-<a name="correctVelocity%28Double%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>correctVelocity</em>(<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Corrects the velocities of this joint's associated bodies.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../../sims/dynamics/joints/Joint.html" target="_self">Joint</a>.<a href="../../../sims/dynamics/joints/Joint.html#correctVelocity%28Double%29" target="_self">correctVelocity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="correctPosition%28Double%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>correctPosition</em>(<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Corrects the positions of this joint's associated bodies.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../../sims/dynamics/joints/Joint.html" target="_self">Joint</a>.<a href="../../../sims/dynamics/joints/Joint.html#correctPosition%28Double%29" target="_self">correctPosition</a>
-        </dd>
-      </dl><hr></hr>
-<a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
+        </head>
+        <body class="type">
+      
+      <p id="owner"><a href="../../package.html">sims</a>.<a href="../package.html">dynamics</a>.<a href="package.html">joints</a></p>
 
+      <div id="definition">
+        <img src="../../../lib/class_big.png" />
+        <h1>SpringJoint</h1>
+      </div>
 
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">SpringJoint</span><span class="params">(<span name="node1">node1: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="anchor1">anchor1: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="node2">node2: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="anchor2">anchor2: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="springConstant">springConstant: <span class="extype" name="scala.Double">Double</span></span>, <span name="initialLength">initialLength: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result"> extends <a href="Joint.html" class="extype" name="sims.dynamics.joints.Joint">Joint</a> with <a href="ForceJoint.html" class="extype" name="sims.dynamics.joints.ForceJoint">ForceJoint</a> with <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>A spring obeying Hooke's law.</p></div>
+      <dl class="paramcmts block"><dt class="param">node1</dt><dd class="cmt"><p>first associated body</p></dd><dt class="param">anchor1</dt><dd class="cmt"><p>first connection point</p></dd><dt class="param">node2</dt><dd class="cmt"><p>second associated body</p></dd><dt class="param">anchor2</dt><dd class="cmt"><p>second connection point</p></dd><dt class="param">springConstant</dt><dd class="cmt"><p>spring constant</p></dd><dt class="param">initialLength</dt><dd class="cmt"><p>initial length</p></dd></dl>
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="sims.dynamics.joints.ForceJoint">ForceJoint</li><li class="in" name="sims.dynamics.joints.Joint">Joint</li><li class="in" name="sims.dynamics.Constraint">Constraint</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.dynamics.joints.SpringJoint#anchor1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">anchor1</span><span class="result">: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.SpringJoint#anchor2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">anchor2</span><span class="result">: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.SpringJoint#applyForce">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">applyForce</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Applies the spring force to the connection points</p><div class="fullcomment">
+      <div class="comment cmt"><p>Applies the spring force to the connection points.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.SpringJoint#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.SpringJoint#connection1">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">connection1</span><span class="result">: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the connection point on body one (in world coordinates)</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the connection point on body one (in world coordinates).</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.SpringJoint#connection2">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">connection2</span><span class="result">: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the connection point on body two (in world coordinates)</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the connection point on body two (in world coordinates).</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.SpringJoint#correctPosition">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctPosition</span><span class="params">(<span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Corrects the positions of this joint's associated bodies</p><div class="fullcomment">
+      <div class="comment cmt"><p>Corrects the positions of this joint's associated bodies.@param h a time interval, used for converting forces and impulses</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.SpringJoint#correctVelocity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctVelocity</span><span class="params">(<span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Corrects the velocities of this joint's associated bodies</p><div class="fullcomment">
+      <div class="comment cmt"><p>Corrects the velocities of this joint's associated bodies.@param h a time interval, used for converting forces and impulses</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.SpringJoint#damping">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">damping</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Damping</p><div class="fullcomment">
+      <div class="comment cmt"><p>Damping.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.SpringJoint#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.SpringJoint#force">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">force</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the spring force</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the spring force.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.SpringJoint#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.SpringJoint#initialLength">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">initialLength</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.SpringJoint#node1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">node1</span><span class="result">: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">First body of the joint</p><div class="fullcomment">
+      <div class="comment cmt"><p>First body of the joint.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.SpringJoint#node2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">node2</span><span class="result">: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Second body of the joint</p><div class="fullcomment">
+      <div class="comment cmt"><p>Second body of the joint.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.SpringJoint#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.SpringJoint#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.SpringJoint#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.SpringJoint#springConstant">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">springConstant</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.SpringJoint#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.SpringJoint#v">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">v</span><span class="result">: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Relative velocity of the connection points</p><div class="fullcomment">
+      <div class="comment cmt"><p>Relative velocity of the connection points.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.SpringJoint#x">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">x</span><span class="result">: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Relative position of the connection points</p><div class="fullcomment">
+      <div class="comment cmt"><p>Relative position of the connection points.</p></div>
+      
+      
+      
+      
+    </div>
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.dynamics.joints.SpringJoint#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">SpringJoint</span><span class="params">(<span name="node1">node1: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="node2">node2: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="springConstant">springConstant: <span class="extype" name="scala.Double">Double</span></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.SpringJoint#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">SpringJoint</span><span class="params">(<span name="node1">node1: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="node2">node2: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="springConstant">springConstant: <span class="extype" name="scala.Double">Double</span></span>, <span name="initialLength">initialLength: <span class="extype" name="scala.Double">Double</span></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.SpringJoint#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">SpringJoint</span><span class="params">(<span name="node1">node1: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="anchor1">anchor1: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="node2">node2: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="anchor2">anchor2: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="springConstant">springConstant: <span class="extype" name="scala.Double">Double</span></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.SpringJoint#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">SpringJoint</span><span class="params">(<span name="node1">node1: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="anchor1">anchor1: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="node2">node2: <a href="../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="anchor2">anchor2: <a href="../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="springConstant">springConstant: <span class="extype" name="scala.Double">Double</span></span>, <span name="initialLength">initialLength: <span class="extype" name="scala.Double">Double</span></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.Joint#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">SpringJoint</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/joints/package.html b/doc/sims/dynamics/joints/package.html
new file mode 100644
index 0000000..bd320c3
--- /dev/null
+++ b/doc/sims/dynamics/joints/package.html
@@ -0,0 +1,105 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for sims.dynamics.joints</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../../package.html">sims</a>.<a href="../package.html">dynamics</a></p>
+
+      <div id="definition">
+        <img src="../../../lib/package_big.png" />
+        <h1>joints</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">joints</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        
+        
+        <div class="members" id="types">
+              <h3>Type Members</h3>
+              <ol><li name="sims.dynamics.joints.DistanceJoint">
+      <h4 class="signature"><a href="DistanceJoint.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">DistanceJoint</span><span class="params">(<span name="node1">node1: Body</span>, <span name="anchor1">anchor1: Vector2D</span>, <span name="node2">node2: Body</span>, <span name="anchor2">anchor2: Vector2D</span>)</span><span class="result"> extends Joint with Product</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">DistanceJoints keep their connection points at a constant distance</p>
+    </li><li name="sims.dynamics.joints.ForceJoint">
+      <h4 class="signature"><a href="ForceJoint.html">
+      <span class="kind">trait</span>
+      <span class="symbol">
+        <span class="name">ForceJoint</span><span class="result"> extends AnyRef</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">A joint which can apply a force to its anchor bodies, thus adding or removing energy to the system</p>
+    </li><li name="sims.dynamics.joints.Joint">
+      <h4 class="signature"><a href="Joint.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Joint</span><span class="result"> extends Constraint</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">Joints constrain the movement of two bodies</p>
+    </li><li name="sims.dynamics.joints.RevoluteJoint">
+      <h4 class="signature"><a href="RevoluteJoint.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">RevoluteJoint</span><span class="params">(<span name="node1">node1: Body</span>, <span name="node2">node2: Body</span>, <span name="anchor">anchor: Vector2D</span>)</span><span class="result"> extends Joint with Product</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">A revolute joint that connects two bodies at a singe point</p>
+    </li><li name="sims.dynamics.joints.SpringJoint">
+      <h4 class="signature"><a href="SpringJoint.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">SpringJoint</span><span class="params">(<span name="node1">node1: Body</span>, <span name="anchor1">anchor1: Vector2D</span>, <span name="node2">node2: Body</span>, <span name="anchor2">anchor2: Vector2D</span>, <span name="springConstant">springConstant: Double</span>, <span name="initialLength">initialLength: Double</span>)</span><span class="result"> extends Joint with ForceJoint with Product</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">A spring obeying Hooke's law</p>
+    </li></ol>
+            </div>
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.dynamics.joints.test">
+      <h4 class="signature"><a href="test/package.html">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">test</span>
+      </span>
+      </a></h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/joints/test$content.html b/doc/sims/dynamics/joints/test$content.html
deleted file mode 100644
index 6509725..0000000
--- a/doc/sims/dynamics/joints/test$content.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>All classes and objects in sims.dynamics.joints.test</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../../script.js"></script>
-        </head>
-        <body onload="init()"><div class="page-title"><div>Simple Mechanics Simulator (SiMS) API</div></div><p><div>This document is the API specification for SiMS</div></p><table summary="" cellpadding="3" class="member">
-        <tr><td class="title" colspan="2">Class Summary</td></tr>
-        <tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/test/PrismaticJoint.html" target="_self">PrismaticJoint</a></em>
-        (<code>val </code><em>node1</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <code>val </code><em>anchor1</em> : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <code>val </code><em>node2</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <code>val </code><em>anchor2</em> : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>)<code> extends </code><a href="../../../sims/dynamics/joints/Joint.html" target="_self">Joint</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/test/UnitCircleJoint.html" target="_self">UnitCircleJoint</a></em>
-        (<em>body</em> : <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <em>anchor</em> : <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>)<code> extends </code><a href="../../../sims/dynamics/joints/Joint.html" target="_self">Joint</a>
-        
-        
-      </td>
-    </tr>        
-        </table>
-<table summary="" cellpadding="3" class="member">
-        <tr><td class="title" colspan="2">Object Summary</td></tr>
-        <tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../sims/dynamics/joints/test/PrismaticJoint$object.html" target="_self">PrismaticJoint</a></em>
-        <code> extends </code>(<a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <a href="../../../sims/dynamics/Body.html" target="_self">Body</a>, <a href="../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) =&gt; <a href="../../../sims/dynamics/joints/test/PrismaticJoint.html" target="_self">PrismaticJoint</a>
-        
-        
-      </td>
-    </tr>        
-        </table></body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/joints/test$package.html b/doc/sims/dynamics/joints/test$package.html
deleted file mode 100644
index b34f98d..0000000
--- a/doc/sims/dynamics/joints/test$package.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>List of classes and objects in package sims.dynamics.joints.test</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../../script.js"></script>
-        </head>
-        <body onload="init()"><table summary="" class="navigation">
-          <tr><td class="navigation-links" valign="top">
-            <a href="../../../sims/dynamics/joints/test$content.html" target="contentFrame">sims.dynamics.joints.test</a>
-          </td></tr>
-        </table><div><div class="kinds" id="Classes">Classes</div><ul class="list">
-        <li id="Classes_P"><a href="../../../sims/dynamics/joints/test/PrismaticJoint.html" target="contentFrame">PrismaticJoint</a></li>
-<li id="Classes_U"><a href="../../../sims/dynamics/joints/test/UnitCircleJoint.html" target="contentFrame">UnitCircleJoint</a></li>
-        </ul>
-<div class="kinds" id="Objects">Objects</div><ul class="list">
-        <li id="Objects_P"><a href="../../../sims/dynamics/joints/test/PrismaticJoint$object.html" target="contentFrame">PrismaticJoint</a></li>
-        </ul></div></body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/joints/test/PrismaticJoint$object.html b/doc/sims/dynamics/joints/test/PrismaticJoint$object.html
deleted file mode 100644
index e460df7..0000000
--- a/doc/sims/dynamics/joints/test/PrismaticJoint$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object PrismaticJoint in sims.dynamics.joints.test</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../../../sims/dynamics/joints/test$package.html" target="_self">sims.dynamics.joints.test</a>
-        <br></br>
-        <span class="entity">object  PrismaticJoint</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/dynamics/joints/test/PrismaticJoint"><code>sims/dynamics/joints/test/PrismaticJoint.scala</code></a>]
-      </div><hr></hr>
-      <a name="PrismaticJoint"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>PrismaticJoint</em>
-      </dt>
-      <dd><code> extends </code>(<a href="../../../../sims/dynamics/Body.html" target="_self">Body</a>, <a href="../../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <a href="../../../../sims/dynamics/Body.html" target="_self">Body</a>, <a href="../../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) =&gt; <a href="../../../../sims/dynamics/joints/test/PrismaticJoint.html" target="_self">PrismaticJoint</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function4">scala.Function4</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function4">scala.Function4.toString</a>, <a href="#curry" target="contentFrame" class="scala/Function4">scala.Function4.curry</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/joints/test/PrismaticJoint.html b/doc/sims/dynamics/joints/test/PrismaticJoint.html
index a5c5a94..2883427 100644
--- a/doc/sims/dynamics/joints/test/PrismaticJoint.html
+++ b/doc/sims/dynamics/joints/test/PrismaticJoint.html
@@ -1,502 +1,345 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class PrismaticJoint in sims.dynamics.joints.test</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../../../script.js"></script>
+        <head>
+          <title>Scaladoc for sims.dynamics.joints.test.PrismaticJoint</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../../../sims/dynamics/joints/test$package.html" target="_self">sims.dynamics.joints.test</a>
-        <br></br>
-        <span class="entity">class  PrismaticJoint</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/dynamics/joints/test/PrismaticJoint"><code>sims/dynamics/joints/test/PrismaticJoint.scala</code></a>]
-      </div><hr></hr>
-      <a name="PrismaticJoint"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>PrismaticJoint</em>(<code>val </code><em>node1</em> : <a href="../../../../sims/dynamics/Body.html" target="_self">Body</a>, <code>val </code><em>anchor1</em> : <a href="../../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <code>val </code><em>node2</em> : <a href="../../../../sims/dynamics/Body.html" target="_self">Body</a>, <code>val </code><em>anchor2</em> : <a href="../../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>)
-      </dt>
-      <dd><code> extends </code><a href="../../../../sims/dynamics/joints/Joint.html" target="_self">Joint</a><code> with </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
-      <table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Additional Constructor Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../../sims/dynamics/joints/test/PrismaticJoint.html#this%28sims.dynamics.Body%2Csims.dynamics.Body%29" target="_self">this</a></em>
-        (<em>node1</em> : <a href="../../../../sims/dynamics/Body.html" target="_self">Body</a>, <em>node2</em> : <a href="../../../../sims/dynamics/Body.html" target="_self">Body</a>) : <a href="../../../../sims/dynamics/joints/test/PrismaticJoint.html" target="_self">PrismaticJoint</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../../sims/dynamics/joints/test/PrismaticJoint.html#angle" target="_self">angle</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../../sims/dynamics/joints/test/PrismaticJoint.html#connection1" target="_self">connection1</a></em>
-         : <a href="../../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../../sims/dynamics/joints/test/PrismaticJoint.html#connection2" target="_self">connection2</a></em>
-         : <a href="../../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../../sims/dynamics/joints/test/PrismaticJoint.html#correctAngular%28Double%29" target="_self">correctAngular</a></em>
-        (<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../../sims/dynamics/joints/test/PrismaticJoint.html#correctLinear%28Double%29" target="_self">correctLinear</a></em>
-        (<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../../sims/dynamics/joints/test/PrismaticJoint.html#correctPosition%28Double%29" target="_self">correctPosition</a></em>
-        (<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Corrects the positions of this joint's associated bodies.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../../sims/dynamics/joints/test/PrismaticJoint.html#correctVelocity%28Double%29" target="_self">correctVelocity</a></em>
-        (<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Corrects the velocities of this joint's associated bodies.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../../sims/dynamics/joints/test/PrismaticJoint.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../../sims/dynamics/joints/test/PrismaticJoint.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../../sims/dynamics/joints/test/PrismaticJoint.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../../sims/dynamics/joints/test/PrismaticJoint.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../../sims/dynamics/joints/test/PrismaticJoint.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../../sims/dynamics/joints/test/PrismaticJoint.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../../sims/dynamics/joints/test/PrismaticJoint.html#v" target="_self">v</a></em>
-         : <a href="../../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../../sims/dynamics/joints/test/PrismaticJoint.html#x" target="_self">x</a></em>
-         : <a href="../../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      <table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Additional Constructor Details</td></tr>
-        </table><div><a name="this%28sims.dynamics.Body%2Csims.dynamics.Body%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>this</em>(<em>node1</em> : <a href="../../../../sims/dynamics/Body.html" target="_self">Body</a>, <em>node2</em> : <a href="../../../../sims/dynamics/Body.html" target="_self">Body</a>) : <a href="../../../../sims/dynamics/joints/test/PrismaticJoint.html" target="_self">PrismaticJoint</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="angle"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>angle</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="connection1"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>connection1</em> : <a href="../../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="connection2"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>connection2</em> : <a href="../../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="x"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>x</em> : <a href="../../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="v"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>v</em> : <a href="../../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="correctVelocity%28Double%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>correctVelocity</em>(<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Corrects the velocities of this joint's associated bodies.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../../../sims/dynamics/joints/Joint.html" target="_self">Joint</a>.<a href="../../../../sims/dynamics/joints/Joint.html#correctVelocity%28Double%29" target="_self">correctVelocity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="correctLinear%28Double%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>correctLinear</em>(<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="correctAngular%28Double%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>correctAngular</em>(<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="correctPosition%28Double%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>correctPosition</em>(<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Corrects the positions of this joint's associated bodies.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../../../sims/dynamics/joints/Joint.html" target="_self">Joint</a>.<a href="../../../../sims/dynamics/joints/Joint.html#correctPosition%28Double%29" target="_self">correctPosition</a>
-        </dd>
-      </dl><hr></hr>
-<a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
+        <body class="type">
+      
+      <p id="owner"><a href="../../../package.html">sims</a>.<a href="../../package.html">dynamics</a>.<a href="../package.html">joints</a>.<a href="package.html">test</a></p>
 
+      <div id="definition">
+        <img src="../../../../lib/class_big.png" />
+        <h1>PrismaticJoint</h1>
+      </div>
 
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">PrismaticJoint</span><span class="params">(<span name="node1">node1: <a href="../../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="anchor1">anchor1: <a href="../../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="node2">node2: <a href="../../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="anchor2">anchor2: <a href="../../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result"> extends <a href="../Joint.html" class="extype" name="sims.dynamics.joints.Joint">Joint</a> with <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="sims.dynamics.joints.Joint">Joint</li><li class="in" name="sims.dynamics.Constraint">Constraint</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.dynamics.joints.test.PrismaticJoint#anchor1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">anchor1</span><span class="result">: <a href="../../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.test.PrismaticJoint#anchor2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">anchor2</span><span class="result">: <a href="../../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.test.PrismaticJoint#angle">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">angle</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.test.PrismaticJoint#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.test.PrismaticJoint#connection1">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">connection1</span><span class="result">: <a href="../../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.test.PrismaticJoint#connection2">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">connection2</span><span class="result">: <a href="../../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.test.PrismaticJoint#correctAngular">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctAngular</span><span class="params">(<span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.test.PrismaticJoint#correctLinear">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctLinear</span><span class="params">(<span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.test.PrismaticJoint#correctPosition">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctPosition</span><span class="params">(<span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Corrects the positions of this joint's associated bodies</p><div class="fullcomment">
+      <div class="comment cmt"><p>Corrects the positions of this joint's associated bodies.@param h a time interval, used for converting forces and impulses</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.test.PrismaticJoint#correctVelocity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctVelocity</span><span class="params">(<span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Corrects the velocities of this joint's associated bodies</p><div class="fullcomment">
+      <div class="comment cmt"><p>Corrects the velocities of this joint's associated bodies.@param h a time interval, used for converting forces and impulses</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.test.PrismaticJoint#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.test.PrismaticJoint#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.test.PrismaticJoint#node1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">node1</span><span class="result">: <a href="../../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">First body of the joint</p><div class="fullcomment">
+      <div class="comment cmt"><p>First body of the joint.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.test.PrismaticJoint#node2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">node2</span><span class="result">: <a href="../../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Second body of the joint</p><div class="fullcomment">
+      <div class="comment cmt"><p>Second body of the joint.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.test.PrismaticJoint#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.test.PrismaticJoint#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.test.PrismaticJoint#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.test.PrismaticJoint#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.test.PrismaticJoint#v">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">v</span><span class="result">: <a href="../../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.test.PrismaticJoint#x">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">x</span><span class="result">: <a href="../../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.dynamics.joints.test.PrismaticJoint#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">PrismaticJoint</span><span class="params">(<span name="node1">node1: <a href="../../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="node2">node2: <a href="../../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.test.PrismaticJoint#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">PrismaticJoint</span><span class="params">(<span name="node1">node1: <a href="../../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="anchor1">anchor1: <a href="../../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="node2">node2: <a href="../../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="anchor2">anchor2: <a href="../../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.Joint#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">PrismaticJoint</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/joints/test/UnitCircleJoint.html b/doc/sims/dynamics/joints/test/UnitCircleJoint.html
index b580f30..d8291c4 100644
--- a/doc/sims/dynamics/joints/test/UnitCircleJoint.html
+++ b/doc/sims/dynamics/joints/test/UnitCircleJoint.html
@@ -1,261 +1,247 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class UnitCircleJoint in sims.dynamics.joints.test</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../../../script.js"></script>
+        <head>
+          <title>Scaladoc for sims.dynamics.joints.test.UnitCircleJoint</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../../../sims/dynamics/joints/test$package.html" target="_self">sims.dynamics.joints.test</a>
-        <br></br>
-        <span class="entity">class  UnitCircleJoint</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/dynamics/joints/test/UnitCircleJoint"><code>sims/dynamics/joints/test/UnitCircleJoint.scala</code></a>]
-      </div><hr></hr>
-      <a name="UnitCircleJoint"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>class</code>
-        <em>UnitCircleJoint</em>(<em>body</em> : <a href="../../../../sims/dynamics/Body.html" target="_self">Body</a>, <em>anchor</em> : <a href="../../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>)
-      </dt>
-      <dd><code> extends </code><a href="../../../../sims/dynamics/joints/Joint.html" target="_self">Joint</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../../../package.html">sims</a>.<a href="../../package.html">dynamics</a>.<a href="../package.html">joints</a>.<a href="package.html">test</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../../sims/dynamics/joints/test/UnitCircleJoint.html#node1" target="_self">node1</a></em>
-         : <a href="../../../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        <div>First body of the joint.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../../sims/dynamics/joints/test/UnitCircleJoint.html#node2" target="_self">node2</a></em>
-         : <a href="../../../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        <div>Second body of the joint.</div>
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../../sims/dynamics/joints/test/UnitCircleJoint.html#connection" target="_self">connection</a></em>
-         : <a href="../../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../../sims/dynamics/joints/test/UnitCircleJoint.html#correctPosition%28Double%29" target="_self">correctPosition</a></em>
-        (<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Corrects the positions of this joint's associated bodies.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../../sims/dynamics/joints/test/UnitCircleJoint.html#correctVelocity%28Double%29" target="_self">correctVelocity</a></em>
-        (<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        <div>Corrects the velocities of this joint's associated bodies.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../../sims/dynamics/joints/test/UnitCircleJoint.html#v" target="_self">v</a></em>
-         : <a href="../../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../../sims/dynamics/joints/test/UnitCircleJoint.html#x" target="_self">x</a></em>
-         : <a href="../../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../../../lib/class_big.png" />
+        <h1>UnitCircleJoint</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">UnitCircleJoint</span><span class="result"> extends <a href="../Joint.html" class="extype" name="sims.dynamics.joints.Joint">Joint</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="node1"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>node1</em> : <a href="../../../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>First body of the joint.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../../../sims/dynamics/joints/Joint.html" target="_self">Joint</a>.<a href="../../../../sims/dynamics/joints/Joint.html#node1" target="_self">node1</a>
-        </dd>
-      </dl><hr></hr>
-<a name="node2"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>node2</em> : <a href="../../../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Second body of the joint.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../../../sims/dynamics/joints/Joint.html" target="_self">Joint</a>.<a href="../../../../sims/dynamics/joints/Joint.html#node2" target="_self">node2</a>
-        </dd>
-      </dl><hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="connection"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>connection</em> : <a href="../../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="x"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>x</em> : <a href="../../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="v"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>v</em> : <a href="../../../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="correctVelocity%28Double%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>correctVelocity</em>(<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Corrects the velocities of this joint's associated bodies.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../../../sims/dynamics/joints/Joint.html" target="_self">Joint</a>.<a href="../../../../sims/dynamics/joints/Joint.html#correctVelocity%28Double%29" target="_self">correctVelocity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="correctPosition%28Double%29"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="sims.dynamics.joints.Joint">Joint</li><li class="in" name="sims.dynamics.Constraint">Constraint</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.dynamics.joints.test.UnitCircleJoint#connection">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">connection</span><span class="result">: <a href="../../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.test.UnitCircleJoint#correctPosition">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctPosition</span><span class="params">(<span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Corrects the positions of this joint's associated bodies</p><div class="fullcomment">
+      <div class="comment cmt"><p>Corrects the positions of this joint's associated bodies.@param h a time interval, used for converting forces and impulses</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.test.UnitCircleJoint#correctVelocity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">correctVelocity</span><span class="params">(<span name="h">h: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Corrects the velocities of this joint's associated bodies</p><div class="fullcomment">
+      <div class="comment cmt"><p>Corrects the velocities of this joint's associated bodies.@param h a time interval, used for converting forces and impulses</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.joints.test.UnitCircleJoint#node1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">node1</span><span class="result">: <a href="../../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">First body of the joint</p><div class="fullcomment">
+      <div class="comment cmt"><p>First body of the joint.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.dynamics.joints.test.UnitCircleJoint#node2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">node2</span><span class="result">: <a href="../../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Second body of the joint</p><div class="fullcomment">
+      <div class="comment cmt"><p>Second body of the joint.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.dynamics.joints.test.UnitCircleJoint#v">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">v</span><span class="result">: <a href="../../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.test.UnitCircleJoint#x">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">x</span><span class="result">: <a href="../../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.dynamics.joints.test.UnitCircleJoint#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">UnitCircleJoint</span><span class="params">(<span name="body">body: <a href="../../Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>, <span name="anchor">anchor: <a href="../../../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.dynamics.joints.Joint#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">UnitCircleJoint</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>correctPosition</em>(<em>h</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Corrects the positions of this joint's associated bodies.</dd></dl>
-      <dl></dl>
-    <dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../../../sims/dynamics/joints/Joint.html" target="_self">Joint</a>.<a href="../../../../sims/dynamics/joints/Joint.html#correctPosition%28Double%29" target="_self">correctPosition</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/joints/test/package.html b/doc/sims/dynamics/joints/test/package.html
new file mode 100644
index 0000000..43414db
--- /dev/null
+++ b/doc/sims/dynamics/joints/test/package.html
@@ -0,0 +1,70 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for sims.dynamics.joints.test</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../../../package.html">sims</a>.<a href="../../package.html">dynamics</a>.<a href="../package.html">joints</a></p>
+
+      <div id="definition">
+        <img src="../../../../lib/package_big.png" />
+        <h1>test</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">test</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        
+        
+        <div class="members" id="types">
+              <h3>Type Members</h3>
+              <ol><li name="sims.dynamics.joints.test.PrismaticJoint">
+      <h4 class="signature"><a href="PrismaticJoint.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">PrismaticJoint</span><span class="params">(<span name="node1">node1: Body</span>, <span name="anchor1">anchor1: Vector2D</span>, <span name="node2">node2: Body</span>, <span name="anchor2">anchor2: Vector2D</span>)</span><span class="result"> extends Joint with Product</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="sims.dynamics.joints.test.UnitCircleJoint">
+      <h4 class="signature"><a href="UnitCircleJoint.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">UnitCircleJoint</span><span class="result"> extends Joint</span>
+      </span>
+      </a></h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/sims/dynamics/package.html b/doc/sims/dynamics/package.html
new file mode 100644
index 0000000..f9e3a86
--- /dev/null
+++ b/doc/sims/dynamics/package.html
@@ -0,0 +1,137 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for sims.dynamics</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">sims</a></p>
+
+      <div id="definition">
+        <img src="../../lib/package_big.png" />
+        <h1>dynamics</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">dynamics</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        
+        
+        <div class="members" id="types">
+              <h3>Type Members</h3>
+              <ol><li name="sims.dynamics.Body">
+      <h4 class="signature"><a href="Body.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Body</span><span class="result"> extends AnyRef</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">A two dimensional rigid body is made out of shapes</p>
+    </li><li name="sims.dynamics.Circle">
+      <h4 class="signature"><a href="Circle.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Circle</span><span class="params">(<span name="radius">radius: Double</span>, <span name="density">density: Double</span>)</span><span class="result"> extends Shape with Product</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">A circle</p>
+    </li><li name="sims.dynamics.Constraint">
+      <h4 class="signature"><a href="Constraint.html">
+      <span class="kind">trait</span>
+      <span class="symbol">
+        <span class="name">Constraint</span><span class="result"> extends AnyRef</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">All constraints in SiMS implement this trait</p>
+    </li><li name="sims.dynamics.Rectangle">
+      <h4 class="signature"><a href="Rectangle.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Rectangle</span><span class="params">(<span name="halfWidth">halfWidth: Double</span>, <span name="halfHeight">halfHeight: Double</span>, <span name="density">density: Double</span>)</span><span class="result"> extends Shape with ConvexPolygon with Product</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">A rectangle is a polygon</p>
+    </li><li name="sims.dynamics.RegularPolygon">
+      <h4 class="signature"><a href="RegularPolygon.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">RegularPolygon</span><span class="params">(<span name="n">n: Int</span>, <span name="radius">radius: Double</span>, <span name="density">density: Double</span>)</span><span class="result"> extends Shape with ConvexPolygon with Product</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">A regular polygon with <code>n</code> sides whose excircle has a radius <code>radius</code></p>
+    </li><li name="sims.dynamics.Shape">
+      <h4 class="signature"><a href="Shape.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Shape</span><span class="result"> extends AnyRef</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">An abstract shape</p>
+    </li><li name="sims.dynamics.World">
+      <h4 class="signature"><a href="World.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">World</span><span class="result"> extends AnyRef</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">A world contains and simulates a system of rigid bodies and joints</p>
+    </li></ol>
+            </div>
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.dynamics.Body">
+      <h4 class="signature"><a href="Body$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Body</span><span class="result"> extends AnyRef</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="sims.dynamics.Shape">
+      <h4 class="signature"><a href="Shape$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Shape</span><span class="result"> extends AnyRef</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="sims.dynamics.joints">
+      <h4 class="signature"><a href="joints/package.html">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">joints</span>
+      </span>
+      </a></h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/sims/geometry$content.html b/doc/sims/geometry$content.html
deleted file mode 100644
index d5e1e86..0000000
--- a/doc/sims/geometry$content.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>All classes and objects in sims.geometry</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../script.js"></script>
-        </head>
-        <body onload="init()"><div class="page-title"><div>Simple Mechanics Simulator (SiMS) API</div></div><p><div>This document is the API specification for SiMS</div></p><table summary="" cellpadding="3" class="member">
-        <tr><td class="title" colspan="2">Class Summary</td></tr>
-        <tr>
-      <td class="modifiers" valign="top"> 
-        <code> trait</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/geometry/ConvexPolygon.html" target="_self">ConvexPolygon</a></em>
-        <code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        <div>Common properties of all convex polygons.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/geometry/Projection.html" target="_self">Projection</a></em>
-        (<code>val </code><em>axis</em> : <a href="../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <code>val </code><em>lower</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <code>val </code><em>upper</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>)<code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        <div>Projection on an axis.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/geometry/Ray.html" target="_self">Ray</a></em>
-        (<code>val </code><em>point</em> : <a href="../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <code>val </code><em>direction</em> : <a href="../sims/geometry/Vector2D.html" target="_self">Vector2D</a>)<code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        <div>A ray.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/geometry/Segment.html" target="_self">Segment</a></em>
-        (<code>val </code><em>vertex1</em> : <a href="../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <code>val </code><em>vertex2</em> : <a href="../sims/geometry/Vector2D.html" target="_self">Vector2D</a>)<code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        <div>A segment is given by its vertices.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/geometry/Vector2D.html" target="_self">Vector2D</a></em>
-        (<code>val </code><em>x</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <code>val </code><em>y</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>)<code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        <div>A 2D vector.</div>
-      </td>
-    </tr>        
-        </table>
-<table summary="" cellpadding="3" class="member">
-        <tr><td class="title" colspan="2">Object Summary</td></tr>
-        <tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/geometry/Projection$object.html" target="_self">Projection</a></em>
-        <code> extends </code>(<a href="../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) =&gt; <a href="../sims/geometry/Projection.html" target="_self">Projection</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/geometry/Ray$object.html" target="_self">Ray</a></em>
-        <code> extends </code>(<a href="../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <a href="../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) =&gt; <a href="../sims/geometry/Ray.html" target="_self">Ray</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/geometry/Segment$object.html" target="_self">Segment</a></em>
-        <code> extends </code>(<a href="../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <a href="../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) =&gt; <a href="../sims/geometry/Segment.html" target="_self">Segment</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/geometry/Vector2D$object.html" target="_self">Vector2D</a></em>
-        <code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        <div>Contains special vectors.</div>
-      </td>
-    </tr>        
-        </table></body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/geometry$package.html b/doc/sims/geometry$package.html
deleted file mode 100644
index c3a4d63..0000000
--- a/doc/sims/geometry$package.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>List of classes and objects in package sims.geometry</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../script.js"></script>
-        </head>
-        <body onload="init()"><table summary="" class="navigation">
-          <tr><td class="navigation-links" valign="top">
-            <a href="../sims/geometry$content.html" target="contentFrame">sims.geometry</a>
-          </td></tr>
-        </table><div><div class="kinds" id="Classes">Classes</div><ul class="list">
-        <li id="Classes_C"><a href="../sims/geometry/ConvexPolygon.html" target="contentFrame">ConvexPolygon</a></li>
-<li id="Classes_P"><a href="../sims/geometry/Projection.html" target="contentFrame">Projection</a></li>
-<li id="Classes_R"><a href="../sims/geometry/Ray.html" target="contentFrame">Ray</a></li>
-<li id="Classes_S"><a href="../sims/geometry/Segment.html" target="contentFrame">Segment</a></li>
-<li id="Classes_V"><a href="../sims/geometry/Vector2D.html" target="contentFrame">Vector2D</a></li>
-        </ul>
-<div class="kinds" id="Objects">Objects</div><ul class="list">
-        <li id="Objects_P"><a href="../sims/geometry/Projection$object.html" target="contentFrame">Projection</a></li>
-<li id="Objects_R"><a href="../sims/geometry/Ray$object.html" target="contentFrame">Ray</a></li>
-<li id="Objects_S"><a href="../sims/geometry/Segment$object.html" target="contentFrame">Segment</a></li>
-<li id="Objects_V"><a href="../sims/geometry/Vector2D$object.html" target="contentFrame">Vector2D</a></li>
-        </ul></div></body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/geometry/ConvexPolygon.html b/doc/sims/geometry/ConvexPolygon.html
index 5db8789..e3cdc96 100644
--- a/doc/sims/geometry/ConvexPolygon.html
+++ b/doc/sims/geometry/ConvexPolygon.html
@@ -1,210 +1,228 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>trait ConvexPolygon in sims.geometry</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for sims.geometry.ConvexPolygon</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/geometry$package.html" target="_self">sims.geometry</a>
-        <br></br>
-        <span class="entity">trait  ConvexPolygon</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/geometry/ConvexPolygon"><code>sims/geometry/ConvexPolygon.scala</code></a>]
-      </div><hr></hr>
-      <a name="ConvexPolygon"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>trait</code>
-        <em>ConvexPolygon</em>
-      </dt>
-      <dd><code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a></dd>
-    </dl>
-      <dl><dd>Common properties of all convex polygons.</dd></dl>
-      <dl></dl>
-    <dl>
-      <dt style="margin:10px 0 0 20px;"><b>Direct Known Subclasses:</b></dt>
-      <dd><a href="../../sims/dynamics/Rectangle.html" target="_self">Rectangle</a>, <a href="../../sims/dynamics/RegularPolygon.html" target="_self">RegularPolygon</a></dd>
-      </dl><hr></hr>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">geometry</a></p>
 
+      <div id="definition">
+        <img src="../../lib/trait_big.png" />
+        <h1>ConvexPolygon</h1>
+      </div>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/ConvexPolygon.html#AABB" target="_self">AABB</a></em>
-         : <a href="../../sims/collision/AABB.html" target="_self">AABB</a>
-        
-        <div>Returns this polygon's axis aligned bounding box.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/ConvexPolygon.html#contains%28sims.geometry.Vector2D%29" target="_self">contains</a></em>
-        (<em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>Checks if the point <code>point</code> is contained in this polygon.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/ConvexPolygon.html#project%28sims.geometry.Vector2D%29" target="_self">project</a></em>
-        (<em>axis</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/geometry/Projection.html" target="_self">Projection</a>
+      <h4 class="signature">
+      <span class="kind">trait</span>
+      <span class="symbol">
+        <span class="name">ConvexPolygon</span><span class="result"> extends AnyRef</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>Common properties of all convex polygons.</p></div>
+      
+      
+      
+      <div class="block">
+                known subclasses: <a href="../dynamics/RegularPolygon.html">RegularPolygon</a>, <a href="../dynamics/Rectangle.html">Rectangle</a>
+              </div>
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <div>Returns the projection of this polygon onto the line given by the directional vector <code>axis</code>.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/ConvexPolygon.html#sides" target="_self">sides</a></em>
-         : <a href="" target="contentFrame" class="scala/Array">scala.Array</a>[<a href="../../sims/geometry/Segment.html" target="_self">Segment</a>]
         
-        <div>Returns all sides of this polygon. The sides are ordered counter-clockwise, the first vertex of the side
-   giving the side index.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>abstract def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/ConvexPolygon.html#vertices" target="_self">vertices</a></em>
-         : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]
         
-        <div>Returns positions of all vertices of this Polygon. Vertices are ordered counter-clockwise.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.geometry.ConvexPolygon#AABB">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">AABB</span><span class="result">: <a href="../collision/AABB.html" class="extype" name="sims.collision.AABB">AABB</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns this polygon's axis aligned bounding box</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns this polygon's axis aligned bounding box.</p></div>
       
-
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="vertices"></a><dl>
-      <dt>
-        
-        <code>abstract</code>
-        <code>def</code>
-        <em>vertices</em> : <a href="" target="contentFrame" class="scala/Seq">scala.Seq</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns positions of all vertices of this Polygon. Vertices are ordered counter-clockwise.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>position vectors of the vertices</dd></dl>
-    <hr></hr>
-<a name="sides"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>sides</em> : <a href="" target="contentFrame" class="scala/Array">scala.Array</a>[<a href="../../sims/geometry/Segment.html" target="_self">Segment</a>]
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns all sides of this polygon. The sides are ordered counter-clockwise, the first vertex of the side
-   giving the side index.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="project%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.ConvexPolygon#contains">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">contains</span><span class="params">(<span name="point">point: <a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Checks if the point <code>point</code> is contained in this polygon</p><div class="fullcomment">
+      <div class="comment cmt"><p>Checks if the point <code>point</code> is contained in this polygon.
+<p>
+A ray is created, originating from the point and following an arbitrary direction (X-Axis was chosen).
+The number of intersections between the ray and this polygon's sides (including vertices) is counted.
+The amount of intersections with vertices is substracted form the previuos number.
+If the latter number is odd, the point is contained in the polygon.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.geometry.ConvexPolygon#project">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">project</span><span class="params">(<span name="axis">axis: <a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <a href="Projection.html" class="extype" name="sims.geometry.Projection">Projection</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the projection of this polygon onto the line given by the directional vector <code>axis</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the projection of this polygon onto the line given by the directional vector <code>axis</code>.</p></div>
+      <dl class="paramcmts block"><dt class="param">axis</dt><dd class="cmt"><p>directional vector of the line</p></dd><dt>returns</dt><dd class="cmt"><p>projection of this polygon</p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.ConvexPolygon#sides">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">sides</span><span class="result">: <span class="extype" name="scala.Array">Array</span>[<a href="Segment.html" class="extype" name="sims.geometry.Segment">Segment</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns all sides of this polygon</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns all sides of this polygon. The sides are ordered counter-clockwise, the first vertex of the side
+giving the side index.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.geometry.ConvexPolygon#vertices">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">vertices</span><span class="result">: <span class="extype" name="scala.collection.Seq">Seq</span>[<a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns positions of all vertices of this Polygon</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns positions of all vertices of this Polygon. Vertices are ordered counter-clockwise.</p></div>
+      
+      <div class="block">
+            attributes: abstract 
+          </div>
+      
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>project</em>(<em>axis</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/geometry/Projection.html" target="_self">Projection</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns the projection of this polygon onto the line given by the directional vector <code>axis</code>.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>axis - </code>directional vector of the line</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>projection of this polygon</dd></dl>
-    <hr></hr>
-<a name="AABB"></a><dl>
-      <dt>
         
-        <code></code>
-        <code>def</code>
-        <em>AABB</em> : <a href="../../sims/collision/AABB.html" target="_self">AABB</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns this polygon's axis aligned bounding box.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>See Also</b></dt><dd>collision.AABB</dd></dl>
-    <hr></hr>
-<a name="contains%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
         
-        <code></code>
-        <code>def</code>
-        <em>contains</em>(<em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Checks if the point <code>point</code> is contained in this polygon.
-   <p>
-   A ray is created, originating from the point and following an arbitrary direction (X-Axis was chosen).
-   The number of intersections between the ray and this polygon's sides (including vertices) is counted.
-   The amount of intersections with vertices is substracted form the previuos number.
-   If the latter number is odd, the point is contained in the polygon.</dd></dl>
-      <dl></dl>
-    <hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/geometry/Projection$object.html b/doc/sims/geometry/Projection$object.html
deleted file mode 100644
index 4b01917..0000000
--- a/doc/sims/geometry/Projection$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Projection in sims.geometry</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/geometry$package.html" target="_self">sims.geometry</a>
-        <br></br>
-        <span class="entity">object  Projection</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/geometry/Projection"><code>sims/geometry/Projection.scala</code></a>]
-      </div><hr></hr>
-      <a name="Projection"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Projection</em>
-      </dt>
-      <dd><code> extends </code>(<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) =&gt; <a href="../../sims/geometry/Projection.html" target="_self">Projection</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function3">scala.Function3</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function3">scala.Function3.toString</a>, <a href="#curry" target="contentFrame" class="scala/Function3">scala.Function3.curry</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/geometry/Projection.html b/doc/sims/geometry/Projection.html
index ad69275..7c180ac 100644
--- a/doc/sims/geometry/Projection.html
+++ b/doc/sims/geometry/Projection.html
@@ -1,330 +1,263 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class Projection in sims.geometry</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/geometry$package.html" target="_self">sims.geometry</a>
-        <br></br>
-        <span class="entity">class  Projection</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/geometry/Projection"><code>sims/geometry/Projection.scala</code></a>]
-      </div><hr></hr>
-      <a name="Projection"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>Projection</em>(<code>val </code><em>axis</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <code>val </code><em>lower</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <code>val </code><em>upper</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>)
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
-      <dl><dd>Projection on an axis.
- <p>
- Projections are commonly used in SiMS for collision detection.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>axis - </code>directional vector of the axis of the projection</dd><dd><code>lower - </code>lower value of the projection</dd><dd><code>upper - </code>upper value of the projection</dd></dl>
+        <head>
+          <title>Scaladoc for sims.geometry.Projection</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
     
+        </head>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">geometry</a></p>
 
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>Projection</h1>
+      </div>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Projection.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Projection.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Projection.html#overlap%28sims.geometry.Projection%29" target="_self">overlap</a></em>
-        (<em>other</em> : <a href="../../sims/geometry/Projection.html" target="_self">Projection</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Returns the overlap between this projection and another projection <code>other</code>.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Projection.html#overlaps%28sims.geometry.Projection%29" target="_self">overlaps</a></em>
-        (<em>other</em> : <a href="../../sims/geometry/Projection.html" target="_self">Projection</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>Checks this projection for overlap with another projection <code>other</code>.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Projection.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Projection.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Projection.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Projection.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Projection</span><span class="params">(<span name="axis">axis: <a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="lower">lower: <span class="extype" name="scala.Double">Double</span></span>, <span name="upper">upper: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result"> extends <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>Projection on an axis.
+<p>
+Projections are commonly used in SiMS for collision detection.</p></div>
+      <dl class="paramcmts block"><dt class="param">axis</dt><dd class="cmt"><p>directional vector of the axis of the projection</p></dd><dt class="param">lower</dt><dd class="cmt"><p>lower value of the projection</p></dd><dt class="param">upper</dt><dd class="cmt"><p>upper value of the projection</p></dd></dl>
       
-
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="overlaps%28sims.geometry.Projection%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>overlaps</em>(<em>other</em> : <a href="../../sims/geometry/Projection.html" target="_self">Projection</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Checks this projection for overlap with another projection <code>other</code>.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Throws</b></dt><dd><code>IllegalArgumentExcepion - </code>if both projections axes aren't the same</dd></dl>
-    <hr></hr>
-<a name="overlap%28sims.geometry.Projection%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>overlap</em>(<em>other</em> : <a href="../../sims/geometry/Projection.html" target="_self">Projection</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns the overlap between this projection and another projection <code>other</code>.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Throws</b></dt><dd><code>IllegalArgumentExcepion - </code>if both projections axes aren't the same</dd></dl>
-    <hr></hr>
-<a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.geometry.Projection#axis">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">axis</span><span class="result">: <a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.Projection#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.Projection#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Projection#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Projection#lower">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">lower</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.Projection#overlap">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">overlap</span><span class="params">(<span name="other">other: <a href="" class="extype" name="sims.geometry.Projection">Projection</a></span>)</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the overlap between this projection and another projection <code>other</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the overlap between this projection and another projection <code>other</code>.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Projection#overlaps">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">overlaps</span><span class="params">(<span name="other">other: <a href="" class="extype" name="sims.geometry.Projection">Projection</a></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Checks this projection for overlap with another projection <code>other</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Checks this projection for overlap with another projection <code>other</code>.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Projection#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.Projection#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.Projection#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.Projection#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Projection#upper">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">upper</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.geometry.Projection#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Projection</span><span class="params">(<span name="axis">axis: <a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="lower">lower: <span class="extype" name="scala.Double">Double</span></span>, <span name="upper">upper: <span class="extype" name="scala.Double">Double</span></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Projection</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/geometry/Ray$object.html b/doc/sims/geometry/Ray$object.html
deleted file mode 100644
index 199fc55..0000000
--- a/doc/sims/geometry/Ray$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Ray in sims.geometry</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/geometry$package.html" target="_self">sims.geometry</a>
-        <br></br>
-        <span class="entity">object  Ray</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/geometry/Ray"><code>sims/geometry/Ray.scala</code></a>]
-      </div><hr></hr>
-      <a name="Ray"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Ray</em>
-      </dt>
-      <dd><code> extends </code>(<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) =&gt; <a href="../../sims/geometry/Ray.html" target="_self">Ray</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function2">scala.Function2</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function2">scala.Function2.toString</a>, <a href="#curry" target="contentFrame" class="scala/Function2">scala.Function2.curry</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/geometry/Ray.html b/doc/sims/geometry/Ray.html
index 79288ce..d2a8ec8 100644
--- a/doc/sims/geometry/Ray.html
+++ b/doc/sims/geometry/Ray.html
@@ -1,328 +1,253 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class Ray in sims.geometry</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/geometry$package.html" target="_self">sims.geometry</a>
-        <br></br>
-        <span class="entity">class  Ray</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/geometry/Ray"><code>sims/geometry/Ray.scala</code></a>]
-      </div><hr></hr>
-      <a name="Ray"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>Ray</em>(<code>val </code><em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <code>val </code><em>direction</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>)
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
-      <dl><dd>A ray.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>point - </code>a point on the ray</dd><dd><code>direction - </code>this ray's directional vector</dd><dt style="margin:10px 0 0 20px;">
-        <b>Throws</b></dt><dd><code>IllegalArgumentException - </code>if the directional vector is the null vector</dd></dl>
+        <head>
+          <title>Scaladoc for sims.geometry.Ray</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
     
+        </head>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">geometry</a></p>
 
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>Ray</h1>
+      </div>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Ray.html#contains%28sims.geometry.Vector2D%29" target="_self">contains</a></em>
-        (<em>p</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>Checks if this ray contains the point <code>p</code>.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Ray.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Ray.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Ray.html#intersects%28sims.geometry.Segment%29" target="_self">intersects</a></em>
-        (<em>s</em> : <a href="../../sims/geometry/Segment.html" target="_self">Segment</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>Checks this ray and the given segment for intersection.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Ray.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Ray.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Ray.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Ray.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Ray</span><span class="params">(<span name="point">point: <a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="direction">direction: <a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result"> extends <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>A ray.</p></div>
+      <dl class="paramcmts block"><dt class="param">point</dt><dd class="cmt"><p>a point on the ray</p></dd><dt class="param">direction</dt><dd class="cmt"><p>this ray's directional vector</p></dd></dl>
       
-
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="intersects%28sims.geometry.Segment%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>intersects</em>(<em>s</em> : <a href="../../sims/geometry/Segment.html" target="_self">Segment</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Checks this ray and the given segment for intersection.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>s - </code>the segment to test for intersection</dd></dl>
-    <hr></hr>
-<a name="contains%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>contains</em>(<em>p</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Checks if this ray contains the point <code>p</code>.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.geometry.Ray#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.Ray#contains">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">contains</span><span class="params">(<span name="p">p: <a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Checks if this ray contains the point <code>p</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Checks if this ray contains the point <code>p</code>.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Ray#direction">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">direction</span><span class="result">: <a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.Ray#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Ray#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Ray#intersects">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">intersects</span><span class="params">(<span name="s">s: <a href="Segment.html" class="extype" name="sims.geometry.Segment">Segment</a></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Checks this ray and the given segment for intersection</p><div class="fullcomment">
+      <div class="comment cmt"><p>Checks this ray and the given segment for intersection.</p></div>
+      <dl class="paramcmts block"><dt class="param">s</dt><dd class="cmt"><p>the segment to test for intersection</p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Ray#point">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">point</span><span class="result">: <a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.Ray#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.Ray#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.Ray#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.Ray#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.geometry.Ray#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Ray</span><span class="params">(<span name="point">point: <a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="direction">direction: <a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Ray</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/geometry/Segment$object.html b/doc/sims/geometry/Segment$object.html
deleted file mode 100644
index fae9e31..0000000
--- a/doc/sims/geometry/Segment$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Segment in sims.geometry</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/geometry$package.html" target="_self">sims.geometry</a>
-        <br></br>
-        <span class="entity">object  Segment</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/geometry/Segment"><code>sims/geometry/Segment.scala</code></a>]
-      </div><hr></hr>
-      <a name="Segment"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Segment</em>
-      </dt>
-      <dd><code> extends </code>(<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) =&gt; <a href="../../sims/geometry/Segment.html" target="_self">Segment</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function2">scala.Function2</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function2">scala.Function2.toString</a>, <a href="#curry" target="contentFrame" class="scala/Function2">scala.Function2.curry</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/geometry/Segment.html b/doc/sims/geometry/Segment.html
index 084cfb6..2d79999 100644
--- a/doc/sims/geometry/Segment.html
+++ b/doc/sims/geometry/Segment.html
@@ -1,442 +1,317 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class Segment in sims.geometry</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/geometry$package.html" target="_self">sims.geometry</a>
-        <br></br>
-        <span class="entity">class  Segment</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/geometry/Segment"><code>sims/geometry/Segment.scala</code></a>]
-      </div><hr></hr>
-      <a name="Segment"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>Segment</em>(<code>val </code><em>vertex1</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <code>val </code><em>vertex2</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>)
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
-      <dl><dd>A segment is given by its vertices.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>vertex1 - </code>position vector of the first vertex</dd><dd><code>vertex2 - </code>position vector of the second vertex</dd><dt style="margin:10px 0 0 20px;">
-        <b>Throws</b></dt><dd><code>IllegalArgumentException - </code>if both vertices are equal</dd></dl>
+        <head>
+          <title>Scaladoc for sims.geometry.Segment</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
     
+        </head>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">geometry</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Segment.html#d" target="_self">d</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Vector from <code>vertex1</code> to <code>vertex2</code>.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Segment.html#d0" target="_self">d0</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Unit directional vector.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Segment.html#length" target="_self">length</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Length of this segment.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Segment.html#n" target="_self">n</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Right normal vector.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Segment.html#n0" target="_self">n0</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Right normal unit vector.</div>
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Segment.html#clipToSegment%28sims.geometry.Segment%29" target="_self">clipToSegment</a></em>
-        (<em>s</em> : <a href="../../sims/geometry/Segment.html" target="_self">Segment</a>) : <a href="" target="contentFrame" class="scala/Option">scala.Option</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Segment.html#distance%28sims.geometry.Vector2D%29" target="_self">distance</a></em>
-        (<em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Smallest distance between this segment and the point <code>point</code>.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Segment.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Segment.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Segment.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Segment.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Segment.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Segment.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>Segment</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Segment</span><span class="params">(<span name="vertex1">vertex1: <a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="vertex2">vertex2: <a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result"> extends <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>A segment is given by its vertices.</p></div>
+      <dl class="paramcmts block"><dt class="param">vertex1</dt><dd class="cmt"><p>position vector of the first vertex</p></dd><dt class="param">vertex2</dt><dd class="cmt"><p>position vector of the second vertex</p></dd></dl>
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="length"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>length</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Length of this segment.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="d"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>d</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Vector from <code>vertex1</code> to <code>vertex2</code>.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="d0"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>d0</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Unit directional vector.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="n"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>n</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Right normal vector.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="n0"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>n0</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Right normal unit vector.</dd></dl>
-      <dl></dl>
-    <hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="distance%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>distance</em>(<em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Smallest distance between this segment and the point <code>point</code>.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="clipToSegment%28sims.geometry.Segment%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>clipToSegment</em>(<em>s</em> : <a href="../../sims/geometry/Segment.html" target="_self">Segment</a>) : <a href="" target="contentFrame" class="scala/Option">scala.Option</a>[<a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>]
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.geometry.Segment#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.Segment#clipToSegment">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">clipToSegment</span><span class="params">(<span name="s">s: <a href="" class="extype" name="sims.geometry.Segment">Segment</a></span>)</span><span class="result">: <span class="extype" name="scala.Option">Option</span>[<a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.Segment#d">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">d</span><span class="result">: <a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Vector from <code>vertex1</code> to <code>vertex2</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Vector from <code>vertex1</code> to <code>vertex2</code>.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Segment#d0">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">d0</span><span class="result">: <a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Unit directional vector</p><div class="fullcomment">
+      <div class="comment cmt"><p>Unit directional vector.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Segment#distance">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">distance</span><span class="params">(<span name="point">point: <a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Smallest distance between this segment and the point <code>point</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Smallest distance between this segment and the point <code>point</code>.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Segment#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Segment#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Segment#length">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">length</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Length of this segment</p><div class="fullcomment">
+      <div class="comment cmt"><p>Length of this segment.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Segment#n">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">n</span><span class="result">: <a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Right normal vector</p><div class="fullcomment">
+      <div class="comment cmt"><p>Right normal vector.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Segment#n0">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">n0</span><span class="result">: <a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Right normal unit vector</p><div class="fullcomment">
+      <div class="comment cmt"><p>Right normal unit vector.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Segment#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.Segment#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.Segment#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.Segment#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Segment#vertex1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">vertex1</span><span class="result">: <a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.Segment#vertex2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">vertex2</span><span class="result">: <a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.geometry.Segment#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Segment</span><span class="params">(<span name="vertex1">vertex1: <a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="vertex2">vertex2: <a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Segment</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/geometry/Vector2D$.html b/doc/sims/geometry/Vector2D$.html
new file mode 100644
index 0000000..52ef68b
--- /dev/null
+++ b/doc/sims/geometry/Vector2D$.html
@@ -0,0 +1,190 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for sims.geometry.Vector2D</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">geometry</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>Vector2D</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Vector2D</span><span class="result"> extends AnyRef</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>Contains special vectors.</p></div>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.geometry.Vector2D#Null">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">Null</span><span class="result">: <a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Null vector</p><div class="fullcomment">
+      <div class="comment cmt"><p>Null vector.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.geometry.Vector2D#i">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">i</span><span class="result">: <a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Horizontal unit vector</p><div class="fullcomment">
+      <div class="comment cmt"><p>Horizontal unit vector. (1,0)</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Vector2D#j">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">j</span><span class="result">: <a href="Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Vertical unit vector</p><div class="fullcomment">
+      <div class="comment cmt"><p>Vertical unit vector. (0,1)</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/sims/geometry/Vector2D$object.html b/doc/sims/geometry/Vector2D$object.html
deleted file mode 100644
index ee73bb6..0000000
--- a/doc/sims/geometry/Vector2D$object.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Vector2D in sims.geometry</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/geometry$package.html" target="_self">sims.geometry</a>
-        <br></br>
-        <span class="entity">object  Vector2D</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/geometry/Vector2D"><code>sims/geometry/Vector2D.scala</code></a>]
-      </div><hr></hr>
-      <a name="Vector2D"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Vector2D</em>
-      </dt>
-      <dd><code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a></dd>
-    </dl>
-      <dl><dd>Contains special vectors.</dd></dl>
-      <dl></dl>
-    
-      
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Vector2D$object.html#Null" target="_self">Null</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Null vector.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Vector2D$object.html#i" target="_self">i</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Horizontal unit vector. (1,0)</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Vector2D$object.html#j" target="_self">j</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Vertical unit vector. (0,1)</div>
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="Null"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>Null</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Null vector.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="i"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>i</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Horizontal unit vector. (1,0)</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="j"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>j</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Vertical unit vector. (0,1)</dd></dl>
-      <dl></dl>
-    <hr></hr></div>
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/geometry/Vector2D.html b/doc/sims/geometry/Vector2D.html
index 816428e..990b144 100644
--- a/doc/sims/geometry/Vector2D.html
+++ b/doc/sims/geometry/Vector2D.html
@@ -1,628 +1,435 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class Vector2D in sims.geometry</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/geometry$package.html" target="_self">sims.geometry</a>
-        <br></br>
-        <span class="entity">class  Vector2D</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/geometry/Vector2D"><code>sims/geometry/Vector2D.scala</code></a>]
-      </div><hr></hr>
-      <a name="Vector2D"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>Vector2D</em>(<code>val </code><em>x</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <code>val </code><em>y</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>)
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
-      <dl><dd>A 2D vector.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>x - </code>1st component</dd><dd><code>y - </code>2nd component</dd></dl>
+        <head>
+          <title>Scaladoc for sims.geometry.Vector2D</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
     
+        </head>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">geometry</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Vector2D.html#length" target="_self">length</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Norm or length of this vector.</div>
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Vector2D.html#*%28Double%29" target="_self">*</a></em>
-        (<em>n</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Scalar multiplication.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Vector2D.html#%2B%28sims.geometry.Vector2D%29" target="_self">+</a></em>
-        (<em>v</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Vector addition.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Vector2D.html#-%28sims.geometry.Vector2D%29" target="_self">-</a></em>
-        (<em>v</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Vector substraction.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Vector2D.html#%2F%28Double%29" target="_self">/</a></em>
-        (<em>n</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Scalar division.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Vector2D.html#components" target="_self">components</a></em>
-         : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>]
-        
-        <div>Returns a list of this vector's components.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Vector2D.html#cross%28sims.geometry.Vector2D%29" target="_self">cross</a></em>
-        (<em>v</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Cross product. Length only because in 2D. The direction would be given by the x3-axis.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Vector2D.html#dot%28sims.geometry.Vector2D%29" target="_self">dot</a></em>
-        (<em>v</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Dot product.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Vector2D.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Vector2D.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Vector2D.html#isNull" target="_self">isNull</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>Checks if this vector is the null vector.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Vector2D.html#leftNormal" target="_self">leftNormal</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Left normal vector. (-y, x)</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Vector2D.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Vector2D.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Vector2D.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Vector2D.html#project%28sims.geometry.Vector2D%29" target="_self">project</a></em>
-        (<em>v</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Returns the projection of this vector onto the vector <code>v</code>.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Vector2D.html#rightNormal" target="_self">rightNormal</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Right normal vector. (y, -x)</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Vector2D.html#rotate%28Double%29" target="_self">rotate</a></em>
-        (<em>angle</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Returns a rotation of this vector by <code>angle</code> radian.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Vector2D.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Vector2D.html#unary_-" target="_self">unary_-</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Unary minus.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/geometry/Vector2D.html#unit" target="_self">unit</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Unit vector.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>Vector2D</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Vector2D</span><span class="params">(<span name="x">x: <span class="extype" name="scala.Double">Double</span></span>, <span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result"> extends <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>A 2D vector.</p></div>
+      <dl class="paramcmts block"><dt class="param">x</dt><dd class="cmt"><p>1st component</p></dd><dt class="param">y</dt><dd class="cmt"><p>2nd component</p></dd></dl>
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="length"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>length</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Norm or length of this vector.</dd></dl>
-      <dl></dl>
-    <hr></hr></div>
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="%2B%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>+</em>(<em>v</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Vector addition.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="-%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>-</em>(<em>v</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Vector substraction.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="*%28Double%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>*</em>(<em>n</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Scalar multiplication.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="%2F%28Double%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>/</em>(<em>n</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Scalar division.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="unary_-"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>unary_-</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Unary minus.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="dot%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>dot</em>(<em>v</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Dot product.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="cross%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>cross</em>(<em>v</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Cross product. Length only because in 2D. The direction would be given by the x3-axis.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="unit"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>unit</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Unit vector.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="project%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>project</em>(<em>v</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns the projection of this vector onto the vector <code>v</code>.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="rotate%28Double%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>rotate</em>(<em>angle</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a rotation of this vector by <code>angle</code> radian.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="leftNormal"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>leftNormal</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Left normal vector. (-y, x)</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="rightNormal"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>rightNormal</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Right normal vector. (y, -x)</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="isNull"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>isNull</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Checks if this vector is the null vector.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="components"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>components</em> : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>]
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a list of this vector's components.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.geometry.Vector2D#*">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">*</span><span class="params">(<span name="n">n: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <a href="" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Scalar multiplication</p><div class="fullcomment">
+      <div class="comment cmt"><p>Scalar multiplication.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Vector2D#+">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">+</span><span class="params">(<span name="v">v: <a href="" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <a href="" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Vector addition</p><div class="fullcomment">
+      <div class="comment cmt"><p>Vector addition.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Vector2D#-">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">-</span><span class="params">(<span name="v">v: <a href="" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <a href="" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Vector substraction</p><div class="fullcomment">
+      <div class="comment cmt"><p>Vector substraction.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Vector2D#/">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">/</span><span class="params">(<span name="n">n: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <a href="" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Scalar division</p><div class="fullcomment">
+      <div class="comment cmt"><p>Scalar division.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Vector2D#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.Vector2D#components">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">components</span><span class="result">: <span class="extype" name="scala.collection.immutable.List">List</span>[<span class="extype" name="scala.Double">Double</span>]</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a list of this vector's components</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a list of this vector's components.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Vector2D#cross">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">cross</span><span class="params">(<span name="v">v: <a href="" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Cross product</p><div class="fullcomment">
+      <div class="comment cmt"><p>Cross product. Length only because in 2D. The direction would be given by the x3-axis.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Vector2D#dot">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">dot</span><span class="params">(<span name="v">v: <a href="" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Dot product</p><div class="fullcomment">
+      <div class="comment cmt"><p>Dot product.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Vector2D#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Vector2D#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Vector2D#isNull">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">isNull</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Checks if this vector is the null vector</p><div class="fullcomment">
+      <div class="comment cmt"><p>Checks if this vector is the null vector.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Vector2D#leftNormal">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">leftNormal</span><span class="result">: <a href="" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Left normal vector</p><div class="fullcomment">
+      <div class="comment cmt"><p>Left normal vector. (-y, x)</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Vector2D#length">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">length</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Norm or length of this vector</p><div class="fullcomment">
+      <div class="comment cmt"><p>Norm or length of this vector.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Vector2D#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.Vector2D#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.Vector2D#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.Vector2D#project">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">project</span><span class="params">(<span name="v">v: <a href="" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <a href="" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the projection of this vector onto the vector <code>v</code></p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the projection of this vector onto the vector <code>v</code>.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Vector2D#rightNormal">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">rightNormal</span><span class="result">: <a href="" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Right normal vector</p><div class="fullcomment">
+      <div class="comment cmt"><p>Right normal vector. (y, -x)</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Vector2D#rotate">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">rotate</span><span class="params">(<span name="angle">angle: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <a href="" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a rotation of this vector by <code>angle</code> radian</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a rotation of this vector by <code>angle</code> radian.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Vector2D#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Vector2D#unary_-">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">unary_-</span><span class="result">: <a href="" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Unary minus</p><div class="fullcomment">
+      <div class="comment cmt"><p>Unary minus.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Vector2D#unit">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">unit</span><span class="result">: <a href="" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Unit vector</p><div class="fullcomment">
+      <div class="comment cmt"><p>Unit vector.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.geometry.Vector2D#x">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">x</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.geometry.Vector2D#y">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">y</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.geometry.Vector2D#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Vector2D</span><span class="params">(<span name="x">x: <span class="extype" name="scala.Double">Double</span></span>, <span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Vector2D</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/geometry/package.html b/doc/sims/geometry/package.html
new file mode 100644
index 0000000..7ae3ade
--- /dev/null
+++ b/doc/sims/geometry/package.html
@@ -0,0 +1,105 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for sims.geometry</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">sims</a></p>
+
+      <div id="definition">
+        <img src="../../lib/package_big.png" />
+        <h1>geometry</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">geometry</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        
+        
+        <div class="members" id="types">
+              <h3>Type Members</h3>
+              <ol><li name="sims.geometry.ConvexPolygon">
+      <h4 class="signature"><a href="ConvexPolygon.html">
+      <span class="kind">trait</span>
+      <span class="symbol">
+        <span class="name">ConvexPolygon</span><span class="result"> extends AnyRef</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">Common properties of all convex polygons</p>
+    </li><li name="sims.geometry.Projection">
+      <h4 class="signature"><a href="Projection.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Projection</span><span class="params">(<span name="axis">axis: Vector2D</span>, <span name="lower">lower: Double</span>, <span name="upper">upper: Double</span>)</span><span class="result"> extends Product</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">Projection on an axis</p>
+    </li><li name="sims.geometry.Ray">
+      <h4 class="signature"><a href="Ray.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Ray</span><span class="params">(<span name="point">point: Vector2D</span>, <span name="direction">direction: Vector2D</span>)</span><span class="result"> extends Product</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">A ray</p>
+    </li><li name="sims.geometry.Segment">
+      <h4 class="signature"><a href="Segment.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Segment</span><span class="params">(<span name="vertex1">vertex1: Vector2D</span>, <span name="vertex2">vertex2: Vector2D</span>)</span><span class="result"> extends Product</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">A segment is given by its vertices</p>
+    </li><li name="sims.geometry.Vector2D">
+      <h4 class="signature"><a href="Vector2D.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Vector2D</span><span class="params">(<span name="x">x: Double</span>, <span name="y">y: Double</span>)</span><span class="result"> extends Product</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">A 2D vector</p>
+    </li></ol>
+            </div>
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.geometry.Vector2D">
+      <h4 class="signature"><a href="Vector2D$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Vector2D</span><span class="result"> extends AnyRef</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">Contains special vectors</p>
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/sims/math$content.html b/doc/sims/math$content.html
deleted file mode 100644
index 8d2df26..0000000
--- a/doc/sims/math$content.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>All classes and objects in sims.math</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../script.js"></script>
-        </head>
-        <body onload="init()"><div class="page-title"><div>Simple Mechanics Simulator (SiMS) API</div></div><p><div>This document is the API specification for SiMS</div></p><table summary="" cellpadding="3" class="member">
-        <tr><td class="title" colspan="2">Class Summary</td></tr>
-        <tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/math/Matrix22.html" target="_self">Matrix22</a></em>
-        (<code>val </code><em>c11</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <code>val </code><em>c12</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <code>val </code><em>c21</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <code>val </code><em>c22</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>)<code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        <div>A 2x2 matrix.</div>
-      </td>
-    </tr>        
-        </table>
-<table summary="" cellpadding="3" class="member">
-        <tr><td class="title" colspan="2">Object Summary</td></tr>
-        <tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/math/Matrix22$object.html" target="_self">Matrix22</a></em>
-        <code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        
-      </td>
-    </tr>        
-        </table></body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/math$package.html b/doc/sims/math$package.html
deleted file mode 100644
index ac34016..0000000
--- a/doc/sims/math$package.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>List of classes and objects in package sims.math</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../script.js"></script>
-        </head>
-        <body onload="init()"><table summary="" class="navigation">
-          <tr><td class="navigation-links" valign="top">
-            <a href="../sims/math$content.html" target="contentFrame">sims.math</a>
-          </td></tr>
-        </table><div><div class="kinds" id="Classes">Classes</div><ul class="list">
-        <li id="Classes_M"><a href="../sims/math/Matrix22.html" target="contentFrame">Matrix22</a></li>
-        </ul>
-<div class="kinds" id="Objects">Objects</div><ul class="list">
-        <li id="Objects_M"><a href="../sims/math/Matrix22$object.html" target="contentFrame">Matrix22</a></li>
-        </ul></div></body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/math/Matrix22$.html b/doc/sims/math/Matrix22$.html
new file mode 100644
index 0000000..59a9e6b
--- /dev/null
+++ b/doc/sims/math/Matrix22$.html
@@ -0,0 +1,156 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for sims.math.Matrix22</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">math</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>Matrix22</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Matrix22</span><span class="result"> extends AnyRef</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.math.Matrix22#apply">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">apply</span><span class="params">(<span name="c1">c1: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="c2">c2: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <a href="Matrix22.html" class="extype" name="sims.math.Matrix22">Matrix22</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/sims/math/Matrix22$object.html b/doc/sims/math/Matrix22$object.html
deleted file mode 100644
index 9411340..0000000
--- a/doc/sims/math/Matrix22$object.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Matrix22 in sims.math</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/math$package.html" target="_self">sims.math</a>
-        <br></br>
-        <span class="entity">object  Matrix22</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/math/Matrix22"><code>sims/math/Matrix22.scala</code></a>]
-      </div><hr></hr>
-      <a name="Matrix22"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Matrix22</em>
-      </dt>
-      <dd><code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/math/Matrix22$object.html#apply%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">apply</a></em>
-        (<em>c1</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <em>c2</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/math/Matrix22.html" target="_self">Matrix22</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="apply%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>apply</em>(<em>c1</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <em>c2</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/math/Matrix22.html" target="_self">Matrix22</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/math/Matrix22.html b/doc/sims/math/Matrix22.html
index b07482d..e3fc756 100644
--- a/doc/sims/math/Matrix22.html
+++ b/doc/sims/math/Matrix22.html
@@ -1,445 +1,339 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class Matrix22 in sims.math</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/math$package.html" target="_self">sims.math</a>
-        <br></br>
-        <span class="entity">class  Matrix22</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/math/Matrix22"><code>sims/math/Matrix22.scala</code></a>]
-      </div><hr></hr>
-      <a name="Matrix22"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>Matrix22</em>(<code>val </code><em>c11</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <code>val </code><em>c12</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <code>val </code><em>c21</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <code>val </code><em>c22</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>)
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
-      <dl><dd>A 2x2 matrix.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>c11 - </code>component 1,1</dd><dd><code>c12 - </code>component 1,2</dd><dd><code>c21 - </code>component 2,1</dd><dd><code>c22 - </code>component 2,2</dd></dl>
+        <head>
+          <title>Scaladoc for sims.math.Matrix22</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
     
-      <table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Additional Constructor Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/math/Matrix22.html#this%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29" target="_self">this</a></em>
-        (<em>c1</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <em>c2</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/math/Matrix22.html" target="_self">Matrix22</a>
-        
-        <div>A 2x2 matrix can be created with two 2D vectors. In this case, each column is represented by a vector.</div>
-      </td>
-    </tr>
-      </table>
-
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/math/Matrix22.html#*%28sims.geometry.Vector2D%29" target="_self">*</a></em>
-        (<em>v</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Multiplikation with a 2D vector.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/math/Matrix22.html#*%28sims.math.Matrix22%29" target="_self">*</a></em>
-        (<em>m</em> : <a href="../../sims/math/Matrix22.html" target="_self">Matrix22</a>) : <a href="../../sims/math/Matrix22.html" target="_self">Matrix22</a>
-        
-        <div>Matrix multiplication.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/math/Matrix22.html#*%28Double%29" target="_self">*</a></em>
-        (<em>n</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="../../sims/math/Matrix22.html" target="_self">Matrix22</a>
-        
-        <div>Scalar multiplication.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/math/Matrix22.html#%2B%28sims.math.Matrix22%29" target="_self">+</a></em>
-        (<em>m</em> : <a href="../../sims/math/Matrix22.html" target="_self">Matrix22</a>) : <a href="../../sims/math/Matrix22.html" target="_self">Matrix22</a>
-        
-        <div>Addition.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/math/Matrix22.html#det" target="_self">det</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        <div>Determinant of this matrix.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/math/Matrix22.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/math/Matrix22.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/math/Matrix22.html#invert" target="_self">invert</a></em>
-         : <a href="../../sims/math/Matrix22.html" target="_self">Matrix22</a>
-        
-        <div>Inverse.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/math/Matrix22.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/math/Matrix22.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/math/Matrix22.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/math/Matrix22.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      <table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Additional Constructor Details</td></tr>
-        </table><div><a name="this%28sims.geometry.Vector2D%2Csims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>this</em>(<em>c1</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>, <em>c2</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/math/Matrix22.html" target="_self">Matrix22</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>A 2x2 matrix can be created with two 2D vectors. In this case, each column is represented by a vector.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>c1 - </code>first column</dd><dd><code>c2 - </code>second column</dd></dl>
-    <hr></hr></div>
+        </head>
+        <body class="type">
+      
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">math</a></p>
 
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>Matrix22</h1>
+      </div>
 
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="det"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>det</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Determinant of this matrix.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="%2B%28sims.math.Matrix22%29"></a><dl>
-      <dt>
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Matrix22</span><span class="params">(<span name="c11">c11: <span class="extype" name="scala.Double">Double</span></span>, <span name="c12">c12: <span class="extype" name="scala.Double">Double</span></span>, <span name="c21">c21: <span class="extype" name="scala.Double">Double</span></span>, <span name="c22">c22: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result"> extends <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>A 2x2 matrix.</p></div>
+      <dl class="paramcmts block"><dt class="param">c11</dt><dd class="cmt"><p>component 1,1</p></dd><dt class="param">c12</dt><dd class="cmt"><p>component 1,2</p></dd><dt class="param">c21</dt><dd class="cmt"><p>component 2,1</p></dd><dt class="param">c22</dt><dd class="cmt"><p>component 2,2</p></dd></dl>
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>+</em>(<em>m</em> : <a href="../../sims/math/Matrix22.html" target="_self">Matrix22</a>) : <a href="../../sims/math/Matrix22.html" target="_self">Matrix22</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Addition.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="*%28Double%29"></a><dl>
-      <dt>
         
-        <code></code>
-        <code>def</code>
-        <em>*</em>(<em>n</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="../../sims/math/Matrix22.html" target="_self">Matrix22</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Scalar multiplication.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="*%28sims.math.Matrix22%29"></a><dl>
-      <dt>
         
-        <code></code>
-        <code>def</code>
-        <em>*</em>(<em>m</em> : <a href="../../sims/math/Matrix22.html" target="_self">Matrix22</a>) : <a href="../../sims/math/Matrix22.html" target="_self">Matrix22</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Matrix multiplication.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="*%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.math.Matrix22#*">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">*</span><span class="params">(<span name="v">v: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Multiplikation with a 2D vector</p><div class="fullcomment">
+      <div class="comment cmt"><p>Multiplikation with a 2D vector.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.math.Matrix22#*">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">*</span><span class="params">(<span name="m">m: <a href="" class="extype" name="sims.math.Matrix22">Matrix22</a></span>)</span><span class="result">: <a href="" class="extype" name="sims.math.Matrix22">Matrix22</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Matrix multiplication</p><div class="fullcomment">
+      <div class="comment cmt"><p>Matrix multiplication.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.math.Matrix22#*">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">*</span><span class="params">(<span name="n">n: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <a href="" class="extype" name="sims.math.Matrix22">Matrix22</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Scalar multiplication</p><div class="fullcomment">
+      <div class="comment cmt"><p>Scalar multiplication.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.math.Matrix22#+">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">+</span><span class="params">(<span name="m">m: <a href="" class="extype" name="sims.math.Matrix22">Matrix22</a></span>)</span><span class="result">: <a href="" class="extype" name="sims.math.Matrix22">Matrix22</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Addition</p><div class="fullcomment">
+      <div class="comment cmt"><p>Addition.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.math.Matrix22#c11">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">c11</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.math.Matrix22#c12">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">c12</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.math.Matrix22#c21">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">c21</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.math.Matrix22#c22">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">c22</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.math.Matrix22#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.math.Matrix22#det">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">det</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Determinant of this matrix</p><div class="fullcomment">
+      <div class="comment cmt"><p>Determinant of this matrix.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.math.Matrix22#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.math.Matrix22#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.math.Matrix22#invert">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">invert</span><span class="result">: <a href="" class="extype" name="sims.math.Matrix22">Matrix22</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Inverse</p><div class="fullcomment">
+      <div class="comment cmt"><p>Inverse.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.math.Matrix22#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.math.Matrix22#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.math.Matrix22#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.math.Matrix22#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>*</em>(<em>v</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Multiplikation with a 2D vector.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="invert"></a><dl>
-      <dt>
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.math.Matrix22#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Matrix22</span><span class="params">(<span name="c1">c1: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>, <span name="c2">c2: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">A 2x2 matrix can be created with two 2D vectors</p><div class="fullcomment">
+      <div class="comment cmt"><p>A 2x2 matrix can be created with two 2D vectors. In this case, each column is represented by a vector.</p></div>
+      <dl class="paramcmts block"><dt class="param">c1</dt><dd class="cmt"><p>first column</p></dd><dt class="param">c2</dt><dd class="cmt"><p>second column</p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.math.Matrix22#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Matrix22</span><span class="params">(<span name="c11">c11: <span class="extype" name="scala.Double">Double</span></span>, <span name="c12">c12: <span class="extype" name="scala.Double">Double</span></span>, <span name="c21">c21: <span class="extype" name="scala.Double">Double</span></span>, <span name="c22">c22: <span class="extype" name="scala.Double">Double</span></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Matrix22</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>invert</em> : <a href="../../sims/math/Matrix22.html" target="_self">Matrix22</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Inverse.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/math/package.html b/doc/sims/math/package.html
new file mode 100644
index 0000000..fd0ba89
--- /dev/null
+++ b/doc/sims/math/package.html
@@ -0,0 +1,73 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for sims.math</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">sims</a></p>
+
+      <div id="definition">
+        <img src="../../lib/package_big.png" />
+        <h1>math</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">math</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        
+        
+        <div class="members" id="types">
+              <h3>Type Members</h3>
+              <ol><li name="sims.math.Matrix22">
+      <h4 class="signature"><a href="Matrix22.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Matrix22</span><span class="params">(<span name="c11">c11: Double</span>, <span name="c12">c12: Double</span>, <span name="c21">c21: Double</span>, <span name="c22">c22: Double</span>)</span><span class="result"> extends Product</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">A 2x2 matrix</p>
+    </li></ol>
+            </div>
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.math.Matrix22">
+      <h4 class="signature"><a href="Matrix22$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Matrix22</span><span class="result"> extends AnyRef</span>
+      </span>
+      </a></h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/sims/package.html b/doc/sims/package.html
new file mode 100644
index 0000000..1502495
--- /dev/null
+++ b/doc/sims/package.html
@@ -0,0 +1,102 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for sims</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      
+
+      <div id="definition">
+        <img src="../lib/package_big.png" />
+        <h1>sims</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">sims</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.collision">
+      <h4 class="signature"><a href="collision/package.html">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">collision</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="sims.dynamics">
+      <h4 class="signature"><a href="dynamics/package.html">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">dynamics</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="sims.geometry">
+      <h4 class="signature"><a href="geometry/package.html">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">geometry</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="sims.math">
+      <h4 class="signature"><a href="math/package.html">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">math</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="sims.prefabs">
+      <h4 class="signature"><a href="prefabs/package.html">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">prefabs</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="sims.util">
+      <h4 class="signature"><a href="util/package.html">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">util</span>
+      </span>
+      </a></h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/sims/prefabs$content.html b/doc/sims/prefabs$content.html
deleted file mode 100644
index dad597c..0000000
--- a/doc/sims/prefabs$content.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>All classes and objects in sims.prefabs</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../script.js"></script>
-        </head>
-        <body onload="init()"><div class="page-title"><div>Simple Mechanics Simulator (SiMS) API</div></div><p><div>This document is the API specification for SiMS</div></p><table summary="" cellpadding="3" class="member">
-        <tr><td class="title" colspan="2">Class Summary</td></tr>
-        <tr>
-      <td class="modifiers" valign="top"> 
-        <code> class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/prefabs/Net.html" target="_self">Net</a></em>
-        (<em>width</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>, <em>height</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>, <em>initPos</em> : <a href="../sims/geometry/Vector2D.html" target="_self">Vector2D</a>)<code> extends </code><a href="../sims/prefabs/Prefab.html" target="_self">Prefab</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> trait</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/prefabs/Prefab.html" target="_self">Prefab</a></em>
-        <code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/prefabs/Pylon.html" target="_self">Pylon</a></em>
-        <code> extends </code><a href="../sims/prefabs/Prefab.html" target="_self">Prefab</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/prefabs/Ragdoll.html" target="_self">Ragdoll</a></em>
-        (<em>position</em> : <a href="../sims/geometry/Vector2D.html" target="_self">Vector2D</a>)<code> extends </code><a href="../sims/prefabs/Prefab.html" target="_self">Prefab</a>
-        
-        
-      </td>
-    </tr>        
-        </table>
-</body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/prefabs$package.html b/doc/sims/prefabs$package.html
deleted file mode 100644
index 490a2cf..0000000
--- a/doc/sims/prefabs$package.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>List of classes and objects in package sims.prefabs</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../script.js"></script>
-        </head>
-        <body onload="init()"><table summary="" class="navigation">
-          <tr><td class="navigation-links" valign="top">
-            <a href="../sims/prefabs$content.html" target="contentFrame">sims.prefabs</a>
-          </td></tr>
-        </table><div><div class="kinds" id="Classes">Classes</div><ul class="list">
-        <li id="Classes_N"><a href="../sims/prefabs/Net.html" target="contentFrame">Net</a></li>
-<li id="Classes_P"><a href="../sims/prefabs/Prefab.html" target="contentFrame">Prefab</a></li>
-<li><a href="../sims/prefabs/Pylon.html" target="contentFrame">Pylon</a></li>
-<li id="Classes_R"><a href="../sims/prefabs/Ragdoll.html" target="contentFrame">Ragdoll</a></li>
-        </ul>
-</div></body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/prefabs/Net.html b/doc/sims/prefabs/Net.html
index 0298260..584df7a 100644
--- a/doc/sims/prefabs/Net.html
+++ b/doc/sims/prefabs/Net.html
@@ -1,232 +1,223 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class Net in sims.prefabs</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for sims.prefabs.Net</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/prefabs$package.html" target="_self">sims.prefabs</a>
-        <br></br>
-        <span class="entity">class  Net</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/prefabs/Net"><code>sims/prefabs/Net.scala</code></a>]
-      </div><hr></hr>
-      <a name="Net"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>class</code>
-        <em>Net</em>(<em>width</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>, <em>height</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>, <em>initPos</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>)
-      </dt>
-      <dd><code> extends </code><a href="../../sims/prefabs/Prefab.html" target="_self">Prefab</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">prefabs</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Net.html#bodies" target="_self">bodies</a></em>
-         : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/dynamics/Body.html" target="_self">Body</a>]
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Net.html#joints" target="_self">joints</a></em>
-         : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/dynamics/joints/DistanceJoint.html" target="_self">DistanceJoint</a>]
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Net.html#nodeDensity" target="_self">nodeDensity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Net.html#nodeDistance" target="_self">nodeDistance</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Net.html#nodeRadius" target="_self">nodeRadius</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Net.html#springConstant" target="_self">springConstant</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Net.html#springDamping" target="_self">springDamping</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>Net</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Net</span><span class="result"> extends <a href="Prefab.html" class="extype" name="sims.prefabs.Prefab">Prefab</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="nodeDistance"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>nodeDistance</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="nodeRadius"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>nodeRadius</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="nodeDensity"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>nodeDensity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="springConstant"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>springConstant</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="springDamping"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>springDamping</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="bodies"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>val</code>
-        <em>bodies</em> : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/dynamics/Body.html" target="_self">Body</a>]
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/prefabs/Prefab.html" target="_self">Prefab</a>.<a href="../../sims/prefabs/Prefab.html#bodies" target="_self">bodies</a>
-        </dd>
-      </dl><hr></hr>
-<a name="joints"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="sims.prefabs.Prefab">Prefab</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.prefabs.Net#bodies">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">bodies</span><span class="result">: <span class="extype" name="scala.collection.immutable.List">List</span>[<a href="../dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.prefabs.Net#joints">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">joints</span><span class="result">: <span class="extype" name="scala.collection.immutable.List">List</span>[<a href="../dynamics/joints/DistanceJoint.html" class="extype" name="sims.dynamics.joints.DistanceJoint">DistanceJoint</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.prefabs.Net#nodeDensity">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">nodeDensity</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.prefabs.Net#nodeDistance">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">nodeDistance</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.prefabs.Net#nodeRadius">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">nodeRadius</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.prefabs.Net#springConstant">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">springConstant</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.prefabs.Net#springDamping">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">springDamping</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.prefabs.Net#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Net</span><span class="params">(<span name="width">width: <span class="extype" name="scala.Int">Int</span></span>, <span name="height">height: <span class="extype" name="scala.Int">Int</span></span>, <span name="initPos">initPos: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Net</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>val</code>
-        <em>joints</em> : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/dynamics/joints/DistanceJoint.html" target="_self">DistanceJoint</a>]
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/prefabs/Prefab.html" target="_self">Prefab</a>.<a href="../../sims/prefabs/Prefab.html#joints" target="_self">joints</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/prefabs/Prefab.html b/doc/sims/prefabs/Prefab.html
index 699ecf9..b2b8a23 100644
--- a/doc/sims/prefabs/Prefab.html
+++ b/doc/sims/prefabs/Prefab.html
@@ -1,121 +1,166 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>trait Prefab in sims.prefabs</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for sims.prefabs.Prefab</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/prefabs$package.html" target="_self">sims.prefabs</a>
-        <br></br>
-        <span class="entity">trait  Prefab</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/prefabs/Prefab"><code>sims/prefabs/Prefab.scala</code></a>]
-      </div><hr></hr>
-      <a name="Prefab"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>trait</code>
-        <em>Prefab</em>
-      </dt>
-      <dd><code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a></dd>
-    </dl><dl>
-      <dt style="margin:10px 0 0 20px;"><b>Direct Known Subclasses:</b></dt>
-      <dd><a href="../../graphyx/tests/Carriage$object.Car.html" target="_self">Carriage.Car</a>, <a href="../../sims/prefabs/Net.html" target="_self">Net</a>, <a href="../../sims/prefabs/Pylon.html" target="_self">Pylon</a>, <a href="../../sims/prefabs/Ragdoll.html" target="_self">Ragdoll</a></dd>
-      </dl><hr></hr>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">prefabs</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Prefab.html#bodies" target="_self">bodies</a></em>
-         : <a href="" target="contentFrame" class="scala/Iterable">scala.Iterable</a>[<a href="../../sims/dynamics/Body.html" target="_self">Body</a>]
-        
+      <div id="definition">
+        <img src="../../lib/trait_big.png" />
+        <h1>Prefab</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">trait</span>
+      <span class="symbol">
+        <span class="name">Prefab</span><span class="result"> extends AnyRef</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      <div class="block">
+                known subclasses: <a href="Ragdoll.html">Ragdoll</a>, <a href="Pylon.html">Pylon</a>, <a href="Net.html">Net</a>, <a href="../../graphyx/tests/Carriage$$Car.html">Car</a>
+              </div>
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
         
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Prefab.html#joints" target="_self">joints</a></em>
-         : <a href="" target="contentFrame" class="scala/Iterable">scala.Iterable</a>[<a href="../../sims/dynamics/joints/Joint.html" target="_self">Joint</a>]
         
         
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.prefabs.Prefab#bodies">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">bodies</span><span class="result">: <span class="extype" name="scala.collection.Iterable">Iterable</span>[<a href="../dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a>]</span>
+      </span>
+      </h4>
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="bodies"></a><dl>
-      <dt>
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.prefabs.Prefab#joints">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">joints</span><span class="result">: <span class="extype" name="scala.collection.Iterable">Iterable</span>[<a href="../dynamics/joints/Joint.html" class="extype" name="sims.dynamics.joints.Joint">Joint</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>val</code>
-        <em>bodies</em> : <a href="" target="contentFrame" class="scala/Iterable">scala.Iterable</a>[<a href="../../sims/dynamics/Body.html" target="_self">Body</a>]
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="joints"></a><dl>
-      <dt>
         
-        <code></code>
-        <code>val</code>
-        <em>joints</em> : <a href="" target="contentFrame" class="scala/Iterable">scala.Iterable</a>[<a href="../../sims/dynamics/joints/Joint.html" target="_self">Joint</a>]
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+        
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/prefabs/Pylon.html b/doc/sims/prefabs/Pylon.html
index cec9b30..1715c04 100644
--- a/doc/sims/prefabs/Pylon.html
+++ b/doc/sims/prefabs/Pylon.html
@@ -1,272 +1,231 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class Pylon in sims.prefabs</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for sims.prefabs.Pylon</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/prefabs$package.html" target="_self">sims.prefabs</a>
-        <br></br>
-        <span class="entity">class  Pylon</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/prefabs/Pylon"><code>sims/prefabs/Pylon.scala</code></a>]
-      </div><hr></hr>
-      <a name="Pylon"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>class</code>
-        <em>Pylon</em>
-      </dt>
-      <dd><code> extends </code><a href="../../sims/prefabs/Prefab.html" target="_self">Prefab</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">prefabs</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Pylon.html#beamHeight" target="_self">beamHeight</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Pylon.html#beamNumber" target="_self">beamNumber</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Pylon.html#beamWidth" target="_self">beamWidth</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> lazy val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Pylon.html#beams" target="_self">beams</a></em>
-         : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/dynamics/joints/DistanceJoint.html" target="_self">DistanceJoint</a>]
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Pylon.html#bodies" target="_self">bodies</a></em>
-         : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/dynamics/Body.html" target="_self">Body</a>]
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Pylon.html#joints" target="_self">joints</a></em>
-         : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/dynamics/joints/DistanceJoint.html" target="_self">DistanceJoint</a>]
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Pylon.html#nodeDensity" target="_self">nodeDensity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> lazy val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Pylon.html#nodes" target="_self">nodes</a></em>
-         : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/dynamics/Body.html" target="_self">Body</a>]
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Pylon.html#position" target="_self">position</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>Pylon</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Pylon</span><span class="result"> extends <a href="Prefab.html" class="extype" name="sims.prefabs.Prefab">Prefab</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="position"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>position</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="nodeDensity"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>nodeDensity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="beamHeight"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>beamHeight</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="beamWidth"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>beamWidth</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="beamNumber"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>beamNumber</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="nodes"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>lazy val</code>
-        <em>nodes</em> : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/dynamics/Body.html" target="_self">Body</a>]
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="beams"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>lazy val</code>
-        <em>beams</em> : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/dynamics/joints/DistanceJoint.html" target="_self">DistanceJoint</a>]
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="bodies"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>val</code>
-        <em>bodies</em> : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/dynamics/Body.html" target="_self">Body</a>]
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/prefabs/Prefab.html" target="_self">Prefab</a>.<a href="../../sims/prefabs/Prefab.html#bodies" target="_self">bodies</a>
-        </dd>
-      </dl><hr></hr>
-<a name="joints"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="sims.prefabs.Prefab">Prefab</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.prefabs.Pylon#beamHeight">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">beamHeight</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.prefabs.Pylon#beamNumber">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">beamNumber</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.prefabs.Pylon#beamWidth">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">beamWidth</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.prefabs.Pylon#beams">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">beams</span><span class="result">: <span class="extype" name="scala.collection.immutable.List">List</span>[<a href="../dynamics/joints/DistanceJoint.html" class="extype" name="sims.dynamics.joints.DistanceJoint">DistanceJoint</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.prefabs.Pylon#bodies">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">bodies</span><span class="result">: <span class="extype" name="scala.collection.immutable.List">List</span>[<a href="../dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.prefabs.Pylon#joints">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">joints</span><span class="result">: <span class="extype" name="scala.collection.immutable.List">List</span>[<a href="../dynamics/joints/DistanceJoint.html" class="extype" name="sims.dynamics.joints.DistanceJoint">DistanceJoint</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.prefabs.Pylon#nodeDensity">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">nodeDensity</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.prefabs.Pylon#nodes">
+      <h4 class="signature">
+      <span class="kind">var</span>
+      <span class="symbol">
+        <span class="name">nodes</span><span class="result">: <span class="extype" name="scala.collection.immutable.List">List</span>[<a href="../dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.prefabs.Pylon#position">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">position</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.prefabs.Pylon#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Pylon</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>val</code>
-        <em>joints</em> : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/dynamics/joints/DistanceJoint.html" target="_self">DistanceJoint</a>]
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/prefabs/Prefab.html" target="_self">Prefab</a>.<a href="../../sims/prefabs/Prefab.html#joints" target="_self">joints</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/prefabs/Ragdoll.html b/doc/sims/prefabs/Ragdoll.html
index 0ae14d2..fe09221 100644
--- a/doc/sims/prefabs/Ragdoll.html
+++ b/doc/sims/prefabs/Ragdoll.html
@@ -1,432 +1,303 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class Ragdoll in sims.prefabs</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for sims.prefabs.Ragdoll</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/prefabs$package.html" target="_self">sims.prefabs</a>
-        <br></br>
-        <span class="entity">class  Ragdoll</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/prefabs/Ragdoll"><code>sims/prefabs/Ragdoll.scala</code></a>]
-      </div><hr></hr>
-      <a name="Ragdoll"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>class</code>
-        <em>Ragdoll</em>(<em>position</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>)
-      </dt>
-      <dd><code> extends </code><a href="../../sims/prefabs/Prefab.html" target="_self">Prefab</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">prefabs</a></p>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Value Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Ragdoll.html#bodies" target="_self">bodies</a></em>
-         : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/dynamics/Body.html" target="_self">Body</a>]
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Ragdoll.html#foot1" target="_self">foot1</a></em>
-         : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Ragdoll.html#foot2" target="_self">foot2</a></em>
-         : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Ragdoll.html#forearm1" target="_self">forearm1</a></em>
-         : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Ragdoll.html#forearm2" target="_self">forearm2</a></em>
-         : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Ragdoll.html#hand1" target="_self">hand1</a></em>
-         : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Ragdoll.html#hand2" target="_self">hand2</a></em>
-         : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Ragdoll.html#headTorso" target="_self">headTorso</a></em>
-         : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Ragdoll.html#joints" target="_self">joints</a></em>
-         : <a href="#Nil" target="contentFrame" class="scala">scala.Nil</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Ragdoll.html#shoulder1" target="_self">shoulder1</a></em>
-         : <a href="../../sims/dynamics/joints/RevoluteJoint.html" target="_self">RevoluteJoint</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Ragdoll.html#shoulder2" target="_self">shoulder2</a></em>
-         : <a href="../../sims/dynamics/joints/RevoluteJoint.html" target="_self">RevoluteJoint</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Ragdoll.html#thigh1" target="_self">thigh1</a></em>
-         : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Ragdoll.html#thigh2" target="_self">thigh2</a></em>
-         : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Ragdoll.html#tibia1" target="_self">tibia1</a></em>
-         : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Ragdoll.html#tibia2" target="_self">tibia2</a></em>
-         : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Ragdoll.html#upperArm1" target="_self">upperArm1</a></em>
-         : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> val</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/prefabs/Ragdoll.html#upperArm2" target="_self">upperArm2</a></em>
-         : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-        
-        
-      </td>
-    </tr>
-      </table>
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>Ragdoll</h1>
+      </div>
 
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Ragdoll</span><span class="result"> extends <a href="Prefab.html" class="extype" name="sims.prefabs.Prefab">Prefab</a></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Value Details</td></tr>
-        </table><div><a name="headTorso"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>headTorso</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="thigh1"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>thigh1</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="thigh2"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>thigh2</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="tibia1"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>tibia1</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="tibia2"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>tibia2</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="foot1"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>foot1</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="foot2"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>foot2</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="upperArm1"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>upperArm1</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="upperArm2"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>upperArm2</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="forearm1"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>forearm1</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="forearm2"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>forearm2</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="hand1"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>hand1</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="hand2"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>hand2</em> : <a href="../../sims/dynamics/Body.html" target="_self">Body</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="bodies"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>val</code>
-        <em>bodies</em> : <a href="" target="contentFrame" class="scala/List">scala.List</a>[<a href="../../sims/dynamics/Body.html" target="_self">Body</a>]
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/prefabs/Prefab.html" target="_self">Prefab</a>.<a href="../../sims/prefabs/Prefab.html#bodies" target="_self">bodies</a>
-        </dd>
-      </dl><hr></hr>
-<a name="shoulder1"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>shoulder1</em> : <a href="../../sims/dynamics/joints/RevoluteJoint.html" target="_self">RevoluteJoint</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="shoulder2"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>val</code>
-        <em>shoulder2</em> : <a href="../../sims/dynamics/joints/RevoluteJoint.html" target="_self">RevoluteJoint</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="joints"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="sims.prefabs.Prefab">Prefab</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.prefabs.Ragdoll#bodies">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">bodies</span><span class="result">: <span class="extype" name="scala.collection.immutable.List">List</span>[<a href="../dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.prefabs.Ragdoll#foot1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">foot1</span><span class="result">: <a href="../dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.prefabs.Ragdoll#foot2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">foot2</span><span class="result">: <a href="../dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.prefabs.Ragdoll#forearm1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">forearm1</span><span class="result">: <a href="../dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.prefabs.Ragdoll#forearm2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">forearm2</span><span class="result">: <a href="../dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.prefabs.Ragdoll#hand1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">hand1</span><span class="result">: <a href="../dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.prefabs.Ragdoll#hand2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">hand2</span><span class="result">: <a href="../dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.prefabs.Ragdoll#headTorso">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">headTorso</span><span class="result">: <a href="../dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.prefabs.Ragdoll#joints">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">joints</span><span class="result">: <span class="extype" name="scala.collection.immutable.Nil">Nil</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.prefabs.Ragdoll#shoulder1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">shoulder1</span><span class="result">: <a href="../dynamics/joints/RevoluteJoint.html" class="extype" name="sims.dynamics.joints.RevoluteJoint">RevoluteJoint</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.prefabs.Ragdoll#shoulder2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">shoulder2</span><span class="result">: <a href="../dynamics/joints/RevoluteJoint.html" class="extype" name="sims.dynamics.joints.RevoluteJoint">RevoluteJoint</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.prefabs.Ragdoll#thigh1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">thigh1</span><span class="result">: <a href="../dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.prefabs.Ragdoll#thigh2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">thigh2</span><span class="result">: <a href="../dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.prefabs.Ragdoll#tibia1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">tibia1</span><span class="result">: <a href="../dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.prefabs.Ragdoll#tibia2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">tibia2</span><span class="result">: <a href="../dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.prefabs.Ragdoll#upperArm1">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">upperArm1</span><span class="result">: <a href="../dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.prefabs.Ragdoll#upperArm2">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">upperArm2</span><span class="result">: <a href="../dynamics/Body.html" class="extype" name="sims.dynamics.Body">Body</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.prefabs.Ragdoll#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Ragdoll</span><span class="params">(<span name="position">position: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Ragdoll</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>val</code>
-        <em>joints</em> : <a href="#Nil" target="contentFrame" class="scala">scala.Nil</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="../../sims/prefabs/Prefab.html" target="_self">Prefab</a>.<a href="../../sims/prefabs/Prefab.html#joints" target="_self">joints</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/prefabs/package.html b/doc/sims/prefabs/package.html
new file mode 100644
index 0000000..78b76e7
--- /dev/null
+++ b/doc/sims/prefabs/package.html
@@ -0,0 +1,86 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for sims.prefabs</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">sims</a></p>
+
+      <div id="definition">
+        <img src="../../lib/package_big.png" />
+        <h1>prefabs</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">prefabs</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        
+        
+        <div class="members" id="types">
+              <h3>Type Members</h3>
+              <ol><li name="sims.prefabs.Net">
+      <h4 class="signature"><a href="Net.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Net</span><span class="result"> extends Prefab</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="sims.prefabs.Prefab">
+      <h4 class="signature"><a href="Prefab.html">
+      <span class="kind">trait</span>
+      <span class="symbol">
+        <span class="name">Prefab</span><span class="result"> extends AnyRef</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="sims.prefabs.Pylon">
+      <h4 class="signature"><a href="Pylon.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Pylon</span><span class="result"> extends Prefab</span>
+      </span>
+      </a></h4>
+      
+    </li><li name="sims.prefabs.Ragdoll">
+      <h4 class="signature"><a href="Ragdoll.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Ragdoll</span><span class="result"> extends Prefab</span>
+      </span>
+      </a></h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/sims/util$content.html b/doc/sims/util$content.html
deleted file mode 100644
index 8db8c6c..0000000
--- a/doc/sims/util$content.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>All classes and objects in sims.util</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../script.js"></script>
-        </head>
-        <body onload="init()"><div class="page-title"><div>Simple Mechanics Simulator (SiMS) API</div></div><p><div>This document is the API specification for SiMS</div></p><table summary="" cellpadding="3" class="member">
-        <tr><td class="title" colspan="2">Class Summary</td></tr>
-        <tr>
-      <td class="modifiers" valign="top"> 
-        <code>case class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/util/Polar.html" target="_self">Polar</a></em>
-        (<code>val </code><em>distance</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <code>val </code><em>angle</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>)<code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a>
-        
-        <div>Polar coordinates.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> class</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/util/RelativeVector.html" target="_self">RelativeVector</a></em>
-        (<code>val </code><em>x</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <code>val </code><em>y</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>)<code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        
-      </td>
-    </tr>        
-        </table>
-<table summary="" cellpadding="3" class="member">
-        <tr><td class="title" colspan="2">Object Summary</td></tr>
-        <tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/util/Polar$object.html" target="_self">Polar</a></em>
-        <code> extends </code>(<a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) =&gt; <a href="../sims/util/Polar.html" target="_self">Polar</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> object</code>
-      </td>
-      <td class="signature">
-        <em><a href="../sims/util/Positioning$object.html" target="_self">Positioning</a></em>
-        <code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        
-        <div>Utility functions for comfortable positioning of bodies.</div>
-      </td>
-    </tr>        
-        </table></body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/util$package.html b/doc/sims/util$package.html
deleted file mode 100644
index 61c5bdc..0000000
--- a/doc/sims/util$package.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>List of classes and objects in package sims.util</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../script.js"></script>
-        </head>
-        <body onload="init()"><table summary="" class="navigation">
-          <tr><td class="navigation-links" valign="top">
-            <a href="../sims/util$content.html" target="contentFrame">sims.util</a>
-          </td></tr>
-        </table><div><div class="kinds" id="Classes">Classes</div><ul class="list">
-        <li id="Classes_P"><a href="../sims/util/Polar.html" target="contentFrame">Polar</a></li>
-<li id="Classes_R"><a href="../sims/util/RelativeVector.html" target="contentFrame">RelativeVector</a></li>
-        </ul>
-<div class="kinds" id="Objects">Objects</div><ul class="list">
-        <li id="Objects_P"><a href="../sims/util/Polar$object.html" target="contentFrame">Polar</a></li>
-<li><a href="../sims/util/Positioning$object.html" target="contentFrame">Positioning</a></li>
-        </ul></div></body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/util/Polar$object.html b/doc/sims/util/Polar$object.html
deleted file mode 100644
index c1ae2b3..0000000
--- a/doc/sims/util/Polar$object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Polar in sims.util</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/util$package.html" target="_self">sims.util</a>
-        <br></br>
-        <span class="entity">object  Polar</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/util/Polar"><code>sims/util/Polar.scala</code></a>]
-      </div><hr></hr>
-      <a name="Polar"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Polar</em>
-      </dt>
-      <dd><code> extends </code>(<a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) =&gt; <a href="../../sims/util/Polar.html" target="_self">Polar</a></dd>
-    </dl>
-      
-
-
-<table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="" target="contentFrame" class="scala/Function2">scala.Function2</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="#toString" target="contentFrame" class="scala/Function2">scala.Function2.toString</a>, <a href="#curry" target="contentFrame" class="scala/Function2">scala.Function2.curry</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/util/Polar.html b/doc/sims/util/Polar.html
index 78fa78d..d2ad5fd 100644
--- a/doc/sims/util/Polar.html
+++ b/doc/sims/util/Polar.html
@@ -1,302 +1,239 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class Polar in sims.util</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/util$package.html" target="_self">sims.util</a>
-        <br></br>
-        <span class="entity">class  Polar</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/util/Polar"><code>sims/util/Polar.scala</code></a>]
-      </div><hr></hr>
-      <a name="Polar"></a><dl>
-      <dt>
-        
-        <code>case</code>
-        <code>class</code>
-        <em>Polar</em>(<code>val </code><em>distance</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <code>val </code><em>angle</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>)
-      </dt>
-      <dd><code> extends </code><a href="" target="contentFrame" class="scala/Product">scala.Product</a></dd>
-    </dl>
-      <dl><dd>Polar coordinates.</dd></dl>
-      <dl></dl>
+        <head>
+          <title>Scaladoc for sims.util.Polar</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
     
+        </head>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">util</a></p>
 
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>Polar</h1>
+      </div>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/util/Polar.html#equals%28Any%29" target="_self">equals</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-        
-        <div>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/util/Polar.html#hashCode%28%29" target="_self">hashCode</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        <div>Returns a hash code value for the object.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/util/Polar.html#productArity" target="_self">productArity</a></em>
-         : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/util/Polar.html#productElement%28Int%29" target="_self">productElement</a></em>
-        (<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/util/Polar.html#productPrefix" target="_self">productPrefix</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/util/Polar.html#toCarthesian" target="_self">toCarthesian</a></em>
-         : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        <div>Returns the vector representation of these polar coordinates.</div>
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>override def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/util/Polar.html#toString%28%29" target="_self">toString</a></em>
-         : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-        
-        <div>Returns a string representation of the object.</div>
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Polar</span><span class="params">(<span name="distance">distance: <span class="extype" name="scala.Double">Double</span></span>, <span name="angle">angle: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result"> extends <span class="extype" name="scala.Product">Product</span></span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>Polar coordinates.</p></div>
       
-
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="toCarthesian"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>toCarthesian</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns the vector representation of these polar coordinates.</dd></dl>
-      <dl></dl>
-    <hr></hr>
-<a name="hashCode%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>hashCode</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a hash code value for the object.  
-    <p>
-    The default hashing algorithm is platform dependent.  
-    Note that it is allowed for two objects to have identical hash
-    codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
-    equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
-    degenerate implementation could always return <code>0</code>.
-    However, it is required that if two objects are equal
-    (<code>o1.equals(o2)</code> returns <code>true</code>) that they
-    have identical hash codes
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
-    overriding this method, be sure to verify that the behavior is
-    consistent with the <code>equals</code> method.
-    </p>
-    <p></dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>the hash code value for the object.      </p></dd></dl>
-    <hr></hr>
-<a name="toString%28%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>toString</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>Returns a string representation of the object.  
-    <p>
-    The default representation is platform dependent.</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd>a string representation of the object.     </p></dd></dl>
-    <hr></hr>
-<a name="equals%28Any%29"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>equals</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Boolean.html" target="_self">Boolean</a>
-      </dt>
-      <dd></dd>
-    </dl>
-      <dl><dd>This method is used to compare the receiver object (<code>this</code>)
-    with the argument object (<code>arg0</code>) for equivalence.  
-    
-    <p>
-    The default implementations of this method is an <a
-    href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
-    relation</a>:
-      <ul>
-      <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>, 
-      <code>x.equals(x)</code> should return <code>true</code>.</li>
-      <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type 
-      <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only 
-      if <code>y.equals(x)</code> returns <code>true</code>.</li>
-      <li>It is transitive: for any instances 
-      <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
-      if <code>x.equals(y)</code> returns <code>true</code> and 
-      <code>y.equals(z)</code> returns 
-      <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
-    </ul>
-    </p>
-    <p>
-    If you override this method, you should verify that
-    your implementation remains an equivalence relation.
-    Additionally, when overriding this method it is often necessary to
-    override <code>hashCode</code> to ensure that objects that are
-    "equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
-    hash to the same <a href="Int.html"><code>Int</code></a>
-    (<code>o1.hashCode.equals(o2.hashCode)</code>).</dd></dl>
-      <dl><dt style="margin:10px 0 0 20px;">
-        <b>Parameters</b></dt><dd><code>arg0 - </code>the object to compare against this object for equality.</dd><dt style="margin:10px 0 0 20px;">
-        <b>Returns</b></dt><dd><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.    </p></dd></dl>
-    <hr></hr>
-<a name="productPrefix"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productPrefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productPrefix" target="contentFrame" class="scala/Product">scala.Product.productPrefix</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productArity"></a><dl>
-      <dt>
-        
-        <code>override</code>
-        <code>def</code>
-        <em>productArity</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productArity" target="contentFrame" class="scala/Product">scala.Product.productArity</a>
-        </dd>
-      </dl><hr></hr>
-<a name="productElement%28Int%29"></a><dl>
-      <dt>
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.Product">Product</li><li class="in" name="scala.Equals">Equals</li><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.util.Polar#angle">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">angle</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.util.Polar#canEqual">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">canEqual</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.util.Polar#distance">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">distance</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.util.Polar#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      
+      
+    </div>
+    </li><li name="sims.util.Polar#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.util.Polar#productArity">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productArity</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.util.Polar#productElement">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElement</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Any">Any</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productElements">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productElements</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.Product#productIterator">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productIterator</span><span class="result">: <span class="extype" name="scala.collection.Iterator">Iterator</span>[<span class="extype" name="scala.Any">Any</span>]</span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.util.Polar#productPrefix">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">productPrefix</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.util.Polar#toCarthesian">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toCarthesian</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns the vector representation of these polar coordinates</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns the vector representation of these polar coordinates.</p></div>
+      
+      
+      
+      
+    </div>
+    </li><li name="sims.util.Polar#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      
+      
+    </div>
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.util.Polar#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Polar</span><span class="params">(<span name="distance">distance: <span class="extype" name="scala.Double">Double</span></span>, <span name="angle">angle: <span class="extype" name="scala.Double">Double</span></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">Polar</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code>override</code>
-        <code>def</code>
-        <em>productElement</em>(<em>arg0</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-      </dt>
-      <dd></dd>
-    </dl><dl>
-        <dt style="margin:10px 0 0 20px;">
-          <b>Overrides</b>
-        </dt>
-        <dd>
-        <a href="" target="contentFrame" class="scala/Product">scala.Product</a>.<a href="#productElement" target="contentFrame" class="scala/Product">scala.Product.productElement</a>
-        </dd>
-      </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/util/Positioning$.html b/doc/sims/util/Positioning$.html
new file mode 100644
index 0000000..f04ce7c
--- /dev/null
+++ b/doc/sims/util/Positioning$.html
@@ -0,0 +1,196 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for sims.util.Positioning</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">util</a></p>
+
+      <div id="definition">
+        <img src="../../lib/object_big.png" />
+        <h1>Positioning</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Positioning</span><span class="result"> extends AnyRef</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      <div class="comment cmt"><p>Utility functions for comfortable positioning of bodies.</p></div>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.util.Positioning#double2RelativeVector">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">double2RelativeVector</span><span class="params">(<span name="x">x: <span class="extype" name="scala.Double">Double</span></span>)</span><span class="result">: <a href="RelativeVector.html" class="extype" name="sims.util.RelativeVector">RelativeVector</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.util.Positioning#int2RelativeVector">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">int2RelativeVector</span><span class="params">(<span name="x">x: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <a href="RelativeVector.html" class="extype" name="sims.util.RelativeVector">RelativeVector</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.util.Positioning#polar2Carthesian">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">polar2Carthesian</span><span class="params">(<span name="p">p: <a href="Polar.html" class="extype" name="sims.util.Polar">Polar</a></span>)</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.util.Positioning#polar2RelativeVector">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">polar2RelativeVector</span><span class="params">(<span name="p">p: <a href="Polar.html" class="extype" name="sims.util.Polar">Polar</a></span>)</span><span class="result">: <a href="RelativeVector.html" class="extype" name="sims.util.RelativeVector">RelativeVector</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.util.Positioning#position">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">position</span><span class="params">(<span name="s">s: <a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>)</span><span class="params">(<span name="a">a: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.util.Positioning#vector2RelativeVector">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">vector2RelativeVector</span><span class="params">(<span name="v">v: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <a href="RelativeVector.html" class="extype" name="sims.util.RelativeVector">RelativeVector</a></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/sims/util/Positioning$object.html b/doc/sims/util/Positioning$object.html
deleted file mode 100644
index 3a9b6c0..0000000
--- a/doc/sims/util/Positioning$object.html
+++ /dev/null
@@ -1,201 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-        <head><title>object Positioning in sims.util</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
-        </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/util$package.html" target="_self">sims.util</a>
-        <br></br>
-        <span class="entity">object  Positioning</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/util/Positioning"><code>sims/util/Positioning.scala</code></a>]
-      </div><hr></hr>
-      <a name="Positioning"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>object</code>
-        <em>Positioning</em>
-      </dt>
-      <dd><code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a></dd>
-    </dl>
-      <dl><dd>Utility functions for comfortable positioning of bodies.</dd></dl>
-      <dl></dl>
-    
-      
-
-
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code>implicit def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/util/Positioning$object.html#double2RelativeVector%28Double%29" target="_self">double2RelativeVector</a></em>
-        (<em>x</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="../../sims/util/RelativeVector.html" target="_self">RelativeVector</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>implicit def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/util/Positioning$object.html#int2RelativeVector%28Int%29" target="_self">int2RelativeVector</a></em>
-        (<em>x</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="../../sims/util/RelativeVector.html" target="_self">RelativeVector</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>implicit def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/util/Positioning$object.html#polar2Carthesian%28sims.util.Polar%29" target="_self">polar2Carthesian</a></em>
-        (<em>p</em> : <a href="../../sims/util/Polar.html" target="_self">Polar</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>implicit def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/util/Positioning$object.html#polar2RelativeVector%28sims.util.Polar%29" target="_self">polar2RelativeVector</a></em>
-        (<em>p</em> : <a href="../../sims/util/Polar.html" target="_self">Polar</a>) : <a href="../../sims/util/RelativeVector.html" target="_self">RelativeVector</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/util/Positioning$object.html#position%28sims.dynamics.Shape%29" target="_self">position</a></em>
-        (<em>s</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>)(<em>a</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code>implicit def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/util/Positioning$object.html#vector2RelativeVector%28sims.geometry.Vector2D%29" target="_self">vector2RelativeVector</a></em>
-        (<em>v</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/util/RelativeVector.html" target="_self">RelativeVector</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
-      
-
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="int2RelativeVector%28Int%29"></a><dl>
-      <dt>
-        
-        <code>implicit</code>
-        <code>def</code>
-        <em>int2RelativeVector</em>(<em>x</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Int.html" target="_self">Int</a>) : <a href="../../sims/util/RelativeVector.html" target="_self">RelativeVector</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="double2RelativeVector%28Double%29"></a><dl>
-      <dt>
-        
-        <code>implicit</code>
-        <code>def</code>
-        <em>double2RelativeVector</em>(<em>x</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>) : <a href="../../sims/util/RelativeVector.html" target="_self">RelativeVector</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="vector2RelativeVector%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code>implicit</code>
-        <code>def</code>
-        <em>vector2RelativeVector</em>(<em>v</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/util/RelativeVector.html" target="_self">RelativeVector</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="polar2Carthesian%28sims.util.Polar%29"></a><dl>
-      <dt>
-        
-        <code>implicit</code>
-        <code>def</code>
-        <em>polar2Carthesian</em>(<em>p</em> : <a href="../../sims/util/Polar.html" target="_self">Polar</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="polar2RelativeVector%28sims.util.Polar%29"></a><dl>
-      <dt>
-        
-        <code>implicit</code>
-        <code>def</code>
-        <em>polar2RelativeVector</em>(<em>p</em> : <a href="../../sims/util/Polar.html" target="_self">Polar</a>) : <a href="../../sims/util/RelativeVector.html" target="_self">RelativeVector</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="position%28sims.dynamics.Shape%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>position</em>(<em>s</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>)(<em>a</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="http://www.scala-lang.org/docu/files/api/scala/Unit.html" target="_self">Unit</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
-      </html>
\ No newline at end of file
diff --git a/doc/sims/util/RelativeVector.html b/doc/sims/util/RelativeVector.html
index b2512f4..99da021 100644
--- a/doc/sims/util/RelativeVector.html
+++ b/doc/sims/util/RelativeVector.html
@@ -1,278 +1,263 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-        <head><title>class RelativeVector in sims.util</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc (version 2.7.5.final)" name="generator"></meta><link href="../../style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="../../script.js"></script>
+        <head>
+          <title>Scaladoc for sims.util.RelativeVector</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
         </head>
-        <body onload="init()">
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-        
-      <div class="entity">
-        <a href="../../sims/util$package.html" target="_self">sims.util</a>
-        <br></br>
-        <span class="entity">class  RelativeVector</span>
-      </div><hr></hr>
-      <div class="source">
-        [source: <a href="" class="sims/util/RelativeVector"><code>sims/util/RelativeVector.scala</code></a>]
-      </div><hr></hr>
-      <a name="RelativeVector"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>class</code>
-        <em>RelativeVector</em>(<code>val </code><em>x</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>, <code>val </code><em>y</em> : <a href="http://www.scala-lang.org/docu/files/api/scala/Double.html" target="_self">Double</a>)
-      </dt>
-      <dd><code> extends </code><a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a></dd>
-    </dl>
+        <body class="type">
       
+      <p id="owner"><a href="../package.html">sims</a>.<a href="package.html">util</a></p>
 
+      <div id="definition">
+        <img src="../../lib/class_big.png" />
+        <h1>RelativeVector</h1>
+      </div>
 
-<table summary="" cellpadding="3" class="member">
-      <tr><td class="title" colspan="2">Method Summary</td></tr>
-      <tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/util/RelativeVector.html#above%28sims.dynamics.Shape%29" target="_self">above</a></em>
-        (<em>s</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/util/RelativeVector.html#above%28sims.geometry.Vector2D%29" target="_self">above</a></em>
-        (<em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/util/RelativeVector.html#below%28sims.geometry.Vector2D%29" target="_self">below</a></em>
-        (<em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/util/RelativeVector.html#below%28sims.dynamics.Shape%29" target="_self">below</a></em>
-        (<em>s</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/util/RelativeVector.html#from%28sims.geometry.Vector2D%29" target="_self">from</a></em>
-        (<em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/util/RelativeVector.html#from%28sims.dynamics.Shape%29" target="_self">from</a></em>
-        (<em>s</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/util/RelativeVector.html#left%28sims.geometry.Vector2D%29" target="_self">left</a></em>
-        (<em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/util/RelativeVector.html#left%28sims.dynamics.Shape%29" target="_self">left</a></em>
-        (<em>s</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/util/RelativeVector.html#right%28sims.geometry.Vector2D%29" target="_self">right</a></em>
-        (<em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../sims/util/RelativeVector.html#right%28sims.dynamics.Shape%29" target="_self">right</a></em>
-        (<em>s</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-        
-        
-      </td>
-    </tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html" target="_self">AnyRef</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#getClass%28%29" target="_self">getClass</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#hashCode%28%29" target="_self">hashCode</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#equals%28Any%29" target="_self">equals</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#clone%28%29" target="_self">clone</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#toString%28%29" target="_self">toString</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notify%28%29" target="_self">notify</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#notifyAll%28%29" target="_self">notifyAll</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28Long%2CInt%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#wait%28%29" target="_self">wait</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#finalize%28%29" target="_self">finalize</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%3D%3D%28AnyRef%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#%21%3D%28AnyRef%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#eq%28AnyRef%29" target="_self">eq</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#ne%28AnyRef%29" target="_self">ne</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/AnyRef.html#synchronized%28T0%29" target="_self">synchronized</a>
-        </td></tr>
-      </table><table summary="" cellpadding="3" class="inherited">
-        <tr><td class="title" colspan="2">
-          Methods inherited from <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html" target="_self">Any</a>
-        </td></tr>
-        <tr><td class="signature" colspan="2">
-          <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%3D%3D%28Any%29" target="_self">==</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#%21%3D%28Any%29" target="_self">!=</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#isInstanceOf" target="_self">isInstanceOf</a>, <a href="http://www.scala-lang.org/docu/files/api/scala/Any.html#asInstanceOf" target="_self">asInstanceOf</a>
-        </td></tr>
-      </table>
-
-
+      <h4 class="signature">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">RelativeVector</span><span class="result"> extends AnyRef</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
       
-
-
-<table summary="" cellpadding="3" class="member-detail">
-          <tr><td class="title">Method Details</td></tr>
-        </table><div><a name="above%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>above</em>(<em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="below%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>below</em>(<em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="left%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>left</em>(<em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="right%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>right</em>(<em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="from%28sims.geometry.Vector2D%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>from</em>(<em>point</em> : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="above%28sims.dynamics.Shape%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>above</em>(<em>s</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="below%28sims.dynamics.Shape%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>below</em>(<em>s</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="left%28sims.dynamics.Shape%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>left</em>(<em>s</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="right%28sims.dynamics.Shape%29"></a><dl>
-      <dt>
-        
-        <code></code>
-        <code>def</code>
-        <em>right</em>(<em>s</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr>
-<a name="from%28sims.dynamics.Shape%29"></a><dl>
-      <dt>
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        <div id="mbrsel">
+              <div id="ancestors">
+                <h3>Inherits</h3>
+                <ol><li class="in" name="scala.AnyRef">AnyRef</li><li class="in" name="scala.Any">Any</li></ol>
+              </div>
+            </div>
+        
+        
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.util.RelativeVector#above">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">above</span><span class="params">(<span name="s">s: <a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>)</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.util.RelativeVector#above">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">above</span><span class="params">(<span name="point">point: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.util.RelativeVector#below">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">below</span><span class="params">(<span name="s">s: <a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>)</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.util.RelativeVector#below">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">below</span><span class="params">(<span name="point">point: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#equals">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">equals</span><span class="params">(<span name="arg0">arg0: <span class="extype" name="scala.Any">Any</span></span>)</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence</p><div class="fullcomment">
+      <div class="comment cmt"><p>This method is used to compare the receiver object (<code>this</code>)
+with the argument object (<code>arg0</code>) for equivalence.</p><p><p>
+The default implementations of this method is an <a
+href="http://en.wikipedia.org/wiki/Equivalence_relation">equivalence
+relation</a>:
+  <ul>
+ <li>It is reflexive: for any instance <code>x</code> of type <code>Any</code>,
+ <code>x.equals(x)</code> should return <code>true</code>.</li>
+ <li>It is symmetric: for any instances <code>x</code> and <code>y</code> of type
+ <code>Any</code>, <code>x.equals(y)</code> should return <code>true</code> if and only
+ if <code>y.equals(x)</code> returns <code>true</code>.</li>
+ <li>It is transitive: for any instances
+ <code>x</code>, <code>y</code>, and <code>z</code> of type <code>AnyRef</code>
+ if <code>x.equals(y)</code> returns <code>true</code> and
+ <code>y.equals(z)</code> returns
+ <code>true</code>, then <code>x.equals(z)</code> should return <code>true</code>.</li>
+</ul>
+</p></p><p><p>
+If you override this method, you should verify that
+your implementation remains an equivalence relation.
+Additionally, when overriding this method it is often necessary to
+override <code>hashCode</code> to ensure that objects that are
+"equal" (<code>o1.equals(o2)</code> returns <code>true</code>)
+hash to the same <a href="Int.html"><code>Int</code></a>
+(<code>o1.hashCode.equals(o2.hashCode)</code>).
+</p></div>
+      <dl class="paramcmts block"><dt class="param">arg0</dt><dd class="cmt"><p>the object to compare against this object for equality.</p></dd><dt>returns</dt><dd class="cmt"><p><code>true</code> if the receiver object is equivalent to the argument; <code>false</code> otherwise.
+</p></p></dd></dl>
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.util.RelativeVector#from">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">from</span><span class="params">(<span name="s">s: <a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>)</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.util.RelativeVector#from">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">from</span><span class="params">(<span name="point">point: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#hashCode">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">hashCode</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a hash code value for the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a hash code value for the object.</p><p><p>
+The default hashing algorithm is platform dependent.</p><p>Note that it is allowed for two objects to have identical hash
+codes (<code>o1.hashCode.equals(o2.hashCode)</code>) yet not be
+equal (<code>o1.equals(o2)</code> returns <code>false</code>).  A
+degenerate implementation could always return <code>0</code>.
+However, it is required that if two objects are equal
+(<code>o1.equals(o2)</code> returns <code>true</code>) that they
+have identical hash codes
+(<code>o1.hashCode.equals(o2.hashCode)</code>).  Therefore, when
+overriding this method, be sure to verify that the behavior is
+consistent with the <code>equals</code> method.
+</p></p><p><p></p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.util.RelativeVector#left">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">left</span><span class="params">(<span name="s">s: <a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>)</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.util.RelativeVector#left">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">left</span><span class="params">(<span name="point">point: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.util.RelativeVector#right">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">right</span><span class="params">(<span name="s">s: <a href="../dynamics/Shape.html" class="extype" name="sims.dynamics.Shape">Shape</a></span>)</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.util.RelativeVector#right">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">right</span><span class="params">(<span name="point">point: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>)</span><span class="result">: <a href="../geometry/Vector2D.html" class="extype" name="sims.geometry.Vector2D">Vector2D</a></span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#toString">
+      <h4 class="signature">
+      <span class="kind">def</span>
+      <span class="symbol">
+        <span class="name">toString</span><span class="params">()</span><span class="result">: <span class="extype" name="java.lang.String">String</span></span>
+      </span>
+      </h4>
+      <p class="shortcomment cmt">Returns a string representation of the object</p><div class="fullcomment">
+      <div class="comment cmt"><p>Returns a string representation of the object.
+<p>
+The default representation is platform dependent.
+</p></div>
+      
+      
+      <div class="block">
+            definition classes: AnyRef ⇐ Any
+          </div>
+      
+    </div>
+    </li><li name="sims.util.RelativeVector#x">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">x</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li><li name="sims.util.RelativeVector#y">
+      <h4 class="signature">
+      <span class="kind">val</span>
+      <span class="symbol">
+        <span class="name">y</span><span class="result">: <span class="extype" name="scala.Double">Double</span></span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
+        
+        <div class="members" id="constructors">
+              <h3>Instance constructors</h3>
+              <ol><li name="sims.util.RelativeVector#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">RelativeVector</span><span class="params">(<span name="x">x: <span class="extype" name="scala.Double">Double</span></span>, <span name="y">y: <span class="extype" name="scala.Double">Double</span></span>)</span>
+      </span>
+      </h4>
+      
+    </li><li name="scala.AnyRef#this">
+      <h4 class="signature">
+      <span class="kind">new</span>
+      <span class="symbol">
+        <span class="name">RelativeVector</span><span class="params">()</span>
+      </span>
+      </h4>
+      
+    </li></ol>
+            </div>
         
-        <code></code>
-        <code>def</code>
-        <em>from</em>(<em>s</em> : <a href="../../sims/dynamics/Shape.html" target="_self">Shape</a>) : <a href="../../sims/geometry/Vector2D.html" target="_self">Vector2D</a>
-      </dt>
-      <dd></dd>
-    </dl><hr></hr></div>
-
-
-    <hr></hr>
-        <table summary="" class="navigation">
-        <tr>
-          <td class="navigation-links" valign="top">
-            <!-- <table><tr></tr></table> -->
-          </td>
-          <td align="right" valign="top" style="white-space:nowrap;" rowspan="2">
-            <div class="doctitle-larger">SiMS</div>
-          </td>
-        </tr>
-        <tr><td></td></tr>
-      </table>
-      </body>
+      </div>
+      
+    </body>
       </html>
\ No newline at end of file
diff --git a/doc/sims/util/package.html b/doc/sims/util/package.html
new file mode 100644
index 0000000..0605149
--- /dev/null
+++ b/doc/sims/util/package.html
@@ -0,0 +1,81 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+        <head>
+          <title>Scaladoc for sims.util</title>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		      <script type="text/javascript" src="../../lib/jquery.js"></script>
+          
+		  <style type="text/css">
+		    @import url(../../lib/template.css) screen;
+		  </style>
+		  <script type="text/javascript" src="../../lib/template.js"></script>
+    
+        </head>
+        <body class="value">
+      
+      <p id="owner"><a href="../package.html">sims</a></p>
+
+      <div id="definition">
+        <img src="../../lib/package_big.png" />
+        <h1>util</h1>
+      </div>
+
+      <h4 class="signature">
+      <span class="kind">package</span>
+      <span class="symbol">
+        <span class="name">util</span>
+      </span>
+      </h4>
+      <div class="fullcomment" id="comment">
+      
+      
+      
+      
+      
+    </div>
+      
+      <div id="template">
+      
+        
+        
+        <div class="members" id="types">
+              <h3>Type Members</h3>
+              <ol><li name="sims.util.Polar">
+      <h4 class="signature"><a href="Polar.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">Polar</span><span class="params">(<span name="distance">distance: Double</span>, <span name="angle">angle: Double</span>)</span><span class="result"> extends Product</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">Polar coordinates</p>
+    </li><li name="sims.util.RelativeVector">
+      <h4 class="signature"><a href="RelativeVector.html">
+      <span class="kind">class</span>
+      <span class="symbol">
+        <span class="name">RelativeVector</span><span class="result"> extends AnyRef</span>
+      </span>
+      </a></h4>
+      
+    </li></ol>
+            </div>
+        
+        <div class="members" id="values">
+              <h3>Value Members</h3>
+              <ol><li name="sims.util.Positioning">
+      <h4 class="signature"><a href="Positioning$.html">
+      <span class="kind">object</span>
+      <span class="symbol">
+        <span class="name">Positioning</span><span class="result"> extends AnyRef</span>
+      </span>
+      </a></h4>
+      <p class="comment cmt">Utility functions for comfortable positioning of bodies</p>
+    </li></ol>
+            </div>
+        
+        
+        
+      </div>
+      
+    </body>
+      </html>
\ No newline at end of file
diff --git a/doc/style.css b/doc/style.css
deleted file mode 100644
index e243249..0000000
--- a/doc/style.css
+++ /dev/null
@@ -1,148 +0,0 @@
-/* Scaladoc style sheet */
-
-a:link {
-	color: #0000ee;
-}
-
-a:visited {
-	color: #551a8b;
-}
-
-a:active {
-	color: #0000ee;
-}
-
-body {
-	background-color: #ffffff;
-}
-
-div.entity {
-	margin: 18px 0px 18px 0px;
-	font-size: x-large;
-	font-weight: bold;
-}
-
-div.doctitle {
-	font-weight: bold;
-	font-style: italic;
-}
-
-div.doctitle-larger {
-	margin: 0px 0px 10px 0px;
-	font-size: larger;
-	font-weight: bold;
-}
-
-div.kinds {
-	margin: 0.6em 0 0 0; /* top right bottom left */
-	font-weight: bold;
-}
-
-div.page-title {
-	margin: 15px 0px 15px 0px;
-	font-size: x-large;
-	font-weight: bold;
-	text-align: center;
-}
-
-div.source {
-	font-size: smaller;
-	color: gray;
-}
-
-span.entity {
-	color: #ff6666;
-}
-
-table.member {
-	margin: 0 0 1.2em 0; /* top rigth bottom left */
-	border-collapse: collapse;
-	border: 2px inset #888888;
-	width: 100%;
-}
-
-table.member td.title {
-	border: 2px inset #888888;
-	background-color: #ccccff;
-	font-size: x-large;
-	font-weight: bold;
-}
-
-table.inherited {
-	margin: 0 0 1.2em 0; /* top rigth bottom left */
-	border-collapse: collapse;
-	border: 2px inset #888888;
-	width: 100%;
-}
-
-table.inherited td.title {
-	background-color: #eeeeff;
-	font-weight: bold;
-}
-
-table.member-detail {
-	margin: 10px 0px 0px 0px;
-	border-collapse: collapse;
-	border: 2px inset #888888;
-	background-color: #ffffff;
-	width: 100%;
-}
-
-table.member-detail td.title {
-	border: 2px inset #888888;
-	background-color: #ccccff;
-	font-size: x-large;
-	font-weight: bold;
-}
-
-table.navigation {
-	border-collapse: collapse;
-	width: 100%;
-	font-family: Arial,Helvetica,Sans-Serif;
-}
-
-td.inherited-members {
-	border-top: 2px inset #888888;
-	border-right: 0px;
-}
-
-td.inherited-owner {
-	background-color: #eeeeff;
-	font-weight: bold;
-}
-
-td.modifiers {
-	border-top: 2px inset #888888;
-        border-right: 2px inset #888888;
-	width: 50px;
-	text-align: right;
-}
-
-td.navigation-enabled {
-	font-weight: bold;
-	color: #000000;
-	background-color: #eeeeff;
-}
-
-td.navigation-links {
-	width: 100%;
-	background-color: #eeeeff;
-}
-
-td.navigation-selected {
-	font-weight: bold;
-	color: #ffffff;
-	background-color: #00008b;
-}
-
-td.signature {
-	border-top: 2px inset #888888;
-	width: 90%;
-}
-
-ul.list {
-	margin: 0;
-	padding: 0;
-	list-style: none;
-}
-
diff --git a/src/graphyx/Graphyx.scala b/src/graphyx/Graphyx.scala
index 01caea8..192b897 100644
--- a/src/graphyx/Graphyx.scala
+++ b/src/graphyx/Graphyx.scala
@@ -22,10 +22,10 @@ object Graphyx{
     Atom,
     Chain,
     Wave,
+    Net,
     Stacking,
     BallStack,
     Cup,
-    Net,
     Friction,
     Friction2,
     Restitution,
@@ -33,6 +33,7 @@ object Graphyx{
     Carriage,
     General1,
     General2,
+    Cannon,
     EmptyTest
   )
   
@@ -48,10 +49,10 @@ object Graphyx{
   
   val physicsActor = new PhysicsActor
   val guiActor = new GUIActor
-  
+
   def main(args: Array[String]): Unit = {
     test.init()
-    physicsActor.world = test.world 
+    physicsActor.world = test.world
     guiActor.start()
     physicsActor.start()
   }
diff --git a/src/graphyx/actors/GUIActor.scala b/src/graphyx/actors/GUIActor.scala
index a704f6a..0116551 100644
--- a/src/graphyx/actors/GUIActor.scala
+++ b/src/graphyx/actors/GUIActor.scala
@@ -7,11 +7,10 @@
 package graphyx.actors
 
 import graphyx.graphics._
-import graphyx.gui._
 import scala.actors._
 
 class GUIActor extends Actor{
-  val container = new Container
+  val container = new graphyx.gui.Container
   
   var continue = true
 
diff --git a/src/graphyx/actors/PhysicsActor.scala b/src/graphyx/actors/PhysicsActor.scala
index b93541f..0bc7faf 100644
--- a/src/graphyx/actors/PhysicsActor.scala
+++ b/src/graphyx/actors/PhysicsActor.scala
@@ -6,6 +6,7 @@
 
 package graphyx.actors
 
+import graphyx._
 import graphyx.graphics._
 import sims.dynamics._
 import scala.actors._
@@ -30,8 +31,9 @@ class PhysicsActor extends Actor{
       
       Graphyx.guiActor ! new Scene(world) {override val fps = _fps}
       
-      while (mailboxSize > 0) {
-        receive {
+        receiveWithin(0) {
+          case TIMEOUT => () 
+            
           case Stop => {
             simulate = false
             println("Simulation stopped.")
@@ -49,7 +51,6 @@ class PhysicsActor extends Actor{
           
           case other => println("Engine received unknown command: '" + other + "'")
      	}
-      }
       
       val h = (System.nanoTime - t0) / 1000000
       val f = 60
diff --git a/src/graphyx/graphics/Drawable.scala b/src/graphyx/graphics/Drawable.scala
index fefd97d..07f3491 100644
--- a/src/graphyx/graphics/Drawable.scala
+++ b/src/graphyx/graphics/Drawable.scala
@@ -13,7 +13,7 @@ import sims.geometry._
 trait Drawable {
   
   /**Java Graphics Objekt zur graphischen Darstellung*/
-  var g: java.awt.Graphics = _
+  var g: java.awt.Graphics2D = _
   
   /**Anzahl von Pixeln pro Meter.*/
   var ppm: Double = 39.37007874015748 * 96 //ppm = i/m * p/i
diff --git a/src/graphyx/graphics/GraphicalRectangle.scala b/src/graphyx/graphics/GraphicalRectangle.scala
index d3774bb..ae65c5e 100644
--- a/src/graphyx/graphics/GraphicalRectangle.scala
+++ b/src/graphyx/graphics/GraphicalRectangle.scala
@@ -15,4 +15,4 @@ case class GraphicalRectangle(real: Rectangle) extends Rectangle(real.halfWidth,
     g.setColor(java.awt.Color.BLACK)
     drawPolygon(vertices)
   }
-}
+}
\ No newline at end of file
diff --git a/src/graphyx/graphics/GraphicalRegularPolygon.scala b/src/graphyx/graphics/GraphicalRegularPolygon.scala
index 919b857..a3906c3 100644
--- a/src/graphyx/graphics/GraphicalRegularPolygon.scala
+++ b/src/graphyx/graphics/GraphicalRegularPolygon.scala
@@ -16,5 +16,4 @@ case class GraphicalRegularPolygon(real: RegularPolygon) extends RegularPolygon(
     g.setColor(java.awt.Color.BLACK)
     drawPolygon(vertices)
   }
-
-}
+}
\ No newline at end of file
diff --git a/src/graphyx/graphics/GraphicalWorld.scala b/src/graphyx/graphics/GraphicalWorld.scala
index 2837d69..abc9cbb 100644
--- a/src/graphyx/graphics/GraphicalWorld.scala
+++ b/src/graphyx/graphics/GraphicalWorld.scala
@@ -13,7 +13,16 @@ case class GraphicalWorld(real: World){
   val iterations = real.iterations
   val overCWarning = real.overCWarning
   val gravity = real.gravity
-  val monitorResults = for (b <- real.bodies; m <- real.monitors; if (b.monitor)) yield "b" + b.uid.toString + " " + m._1 + ": " + m._2(b)
+  val monitorResults = for (m <- real.monitors) yield
+    new MonitorResult(m,
+                      for (b <- real.bodies.toList; if (b.monitor)) yield (b.uid, m._1, m._2(b))
+    )
+  val monitorFlatResults = for (b <- real.bodies; m <- real.monitors; if (b.monitor)) yield (b.uid, m._1, m._2(b))
   val enableCollisionDetection = real.enableCollisionDetection
   val enablePositionCorrection = real.enablePositionCorrection
 }
+
+class MonitorResult (
+  val monitor: (String, Body => Any),
+  val results: List[(Int, String, Any)]
+)
diff --git a/src/graphyx/gui/AboutHelpFrame.scala b/src/graphyx/gui/AboutHelpFrame.scala
index 4dba9f1..52bfb73 100644
--- a/src/graphyx/gui/AboutHelpFrame.scala
+++ b/src/graphyx/gui/AboutHelpFrame.scala
@@ -9,11 +9,13 @@ class AboutHelpFrame extends Frame {
   title = "About"
   contents = new TextArea(
      """|Graphyx, testing and visualization tool for SiMS.
-     	|
+    	|
      	|copyright (c) 2009 Jakob Odersky
      	|SiMS and Graphyx are made available under the MIT License
      	|
-     	|http://sourceforge.net/projects/simplemechanics/""".stripMargin
+     	|http://sourceforge.net/projects/simplemechanics/
+     	|
+     	|Version 1.1""".stripMargin
   ) {editable = false}
 }
 
diff --git a/src/graphyx/gui/Container.scala b/src/graphyx/gui/Container.scala
index 5181df7..80886f8 100644
--- a/src/graphyx/gui/Container.scala
+++ b/src/graphyx/gui/Container.scala
@@ -6,12 +6,14 @@
 
 package graphyx.gui
 
-import graphyx.graphics._
 import sims.dynamics._
-
+import graphyx.graphics._
+import java.io._
 class Container {
   val mainFrame = new MainFrame(this)
   
+  //val plotFrames = new ArrayBuffer[plot.PlotFrame[Body]]
+  
   var scene: Scene = Scene(new World)
   
   def show() = {
@@ -20,6 +22,7 @@ class Container {
   
   def update(s: Scene) = {
     scene = s
+    mainFrame.mainPanel.controlPanel.update()
     mainFrame.mainPanel.worldPanel.update()
     mainFrame.mainPanel.infoPanel.update()
     mainFrame.mainPanel.optionsPanel.update()
@@ -29,5 +32,6 @@ class Container {
   def exitGUI() = {
     mainFrame.dispose
     AboutHelpFrame.frame.dispose
+    //plotFrames.foreach(_.dispose)
   }
 }
diff --git a/src/graphyx/gui/ControlPanel.scala b/src/graphyx/gui/ControlPanel.scala
index 2708d54..2cde7e6 100644
--- a/src/graphyx/gui/ControlPanel.scala
+++ b/src/graphyx/gui/ControlPanel.scala
@@ -6,6 +6,7 @@
 
 package graphyx.gui
 
+import graphyx._
 import graphyx.actors._
 import graphyx.gui._
 import scala.swing._
@@ -33,4 +34,7 @@ class ControlPanel(container: Container) extends BoxPanel(Orientation.Horizontal
     case SelectionChanged(`cboTest`) => Graphyx.test = Graphyx.tests(cboTest.selection.index)
   }
   
+  def update() {
+   btnFire.enabled = Graphyx.test.enableEvent 
+  }
 }
diff --git a/src/graphyx/gui/InfoPanel.scala b/src/graphyx/gui/InfoPanel.scala
index 484f3d7..6e58ba3 100644
--- a/src/graphyx/gui/InfoPanel.scala
+++ b/src/graphyx/gui/InfoPanel.scala
@@ -23,6 +23,6 @@ class InfoPanel(container: Container) extends BoxPanel(Orientation.Vertical){
       out.text += "Warning: some bodies passed the speed of light! Simulation may be highly incorrect.\n"
     }
     else out.foreground = java.awt.Color.black
-    for (r <- container.scene.world.monitorResults) out.text += r + "\n"
+    for (r <- container.scene.world.monitorFlatResults) out.text += "b" + r._1 + " " + r._2 + ": " + r._3 + "\n"
   }
 }
diff --git a/src/graphyx/gui/MainFrame.scala b/src/graphyx/gui/MainFrame.scala
index 89812a5..6b1f2fe 100644
--- a/src/graphyx/gui/MainFrame.scala
+++ b/src/graphyx/gui/MainFrame.scala
@@ -6,6 +6,7 @@
 
 package graphyx.gui
 
+import graphyx._
 import sims._
 import scala.swing._
 
diff --git a/src/graphyx/gui/WorldPanel.scala b/src/graphyx/gui/WorldPanel.scala
index cd91f00..7f9fbee 100644
--- a/src/graphyx/gui/WorldPanel.scala
+++ b/src/graphyx/gui/WorldPanel.scala
@@ -11,6 +11,8 @@ import sims.geometry._
 import sims.dynamics._
 import scala.swing._
 import scala.swing.event._
+import scala.collection.mutable.Map
+import scala.collection.mutable.Queue
 
 class WorldPanel(container: Container) extends BoxPanel(Orientation.Vertical){
   cursor = new java.awt.Cursor(java.awt.Cursor.CROSSHAIR_CURSOR)
@@ -44,8 +46,8 @@ class WorldPanel(container: Container) extends BoxPanel(Orientation.Vertical){
   var drawCollisions = false
   var trace = false
   
-  override def paintComponent(g: java.awt.Graphics) = {
-    var parts: Seq[graphyx.graphics.Drawable] = Seq()
+  override def paintComponent(g: java.awt.Graphics2D) = {
+    var parts: Seq[Drawable] = Seq()
     if (drawShapes) parts ++= scene.shapes
     if (drawJoints) parts ++= scene.joints
     if (drawAABBs) parts ++= scene.aabbs
@@ -60,7 +62,7 @@ class WorldPanel(container: Container) extends BoxPanel(Orientation.Vertical){
     g.translate(-offset.x.toInt, offset.y.toInt)
   }
   
-  def drawAxes(g: java.awt.Graphics): Unit = {
+  def drawAxes(g: java.awt.Graphics2D): Unit = {
     g.setColor(java.awt.Color.GRAY)
     g.drawLine(0, size.height - offset.y.toInt, size.width, size.height - offset.y.toInt)
     g.drawLine(offset.x.toInt, 0, offset.x.toInt, size.height)
@@ -72,7 +74,7 @@ class WorldPanel(container: Container) extends BoxPanel(Orientation.Vertical){
     */
   }
     
-  def drawParts(parts: Iterable[graphics.Drawable], g: java.awt.Graphics) = {
+  def drawParts(parts: Iterable[Drawable], g: java.awt.Graphics2D) = {
      for (p <- parts){
       p.g = g
       p.windowHeight = super.size.height
@@ -82,9 +84,8 @@ class WorldPanel(container: Container) extends BoxPanel(Orientation.Vertical){
     }
   }
   
-  import collection.mutable._
-  val prevPos: collection.mutable.Map[Int, collection.mutable.Queue[Vector2D]] = Map()
-  def trace(shapes: Iterable[graphics.GraphicalShape], g: java.awt.Graphics) = {
+  val prevPos: Map[Int, Queue[Vector2D]] = Map()
+  def trace(shapes: Iterable[GraphicalShape], g: java.awt.Graphics2D) = {
     for (s <- shapes) {
       s.g = g
       s.windowHeight = super.size.height
diff --git a/src/graphyx/tests/Atom.scala b/src/graphyx/tests/Atom.scala
index 84fe05c..31d03fc 100644
--- a/src/graphyx/tests/Atom.scala
+++ b/src/graphyx/tests/Atom.scala
@@ -22,6 +22,7 @@ object Atom extends Test{
     connections = Nil
   }
   
+  enableEvent = true
   override def fireEvent = {
     val e = (new Circle(0.1, 10) {pos = Vector2D(0, -1)}).asBody
     e.linearVelocity = Vector2D(-50,100)
diff --git a/src/graphyx/tests/Cannon.scala b/src/graphyx/tests/Cannon.scala
new file mode 100644
index 0000000..7738103
--- /dev/null
+++ b/src/graphyx/tests/Cannon.scala
@@ -0,0 +1,59 @@
+package graphyx.tests
+
+import sims.dynamics._
+import sims.geometry._
+import sims.prefabs._
+
+object Cannon extends Test{
+  val title = "Cannon"
+  val world = new World
+  
+  def init = { 
+    val cannon = new Prefab{
+      val hull = new Body(
+      new Rectangle(0.1,0.5,1) {pos = Vector2D(0.1, 0.6); friction = 0.0},
+      new Rectangle(0.1,0.5,1) {pos = Vector2D(0.5, 0.6); friction = 0.0},
+      new Rectangle(0.1,0.1,1) {pos = Vector2D(0.3, 0.2); friction = 0.0}
+      )
+      hull.fixed = true
+      hull.rotation -= Math.Pi / 2
+    
+      val ball = new Body(new Circle(0.1,100) {pos = Vector2D(0.3, 0.56)})
+    
+      override val bodies = List(hull, ball)
+      override val joints = Nil
+    }
+    val n = 10
+    val r = 0.1
+    val initialPos = Vector2D(5,0)
+    val stack = for (i <- (0 to n).toList) yield {
+      for (j <- (0 to n-i).toList) yield
+        new Body(
+          new Circle(r,10){
+            pos = Vector2D(2 * j * r + i * r, 1.7 * i * r) + initialPos
+          }
+        ) {fixed = (i == 0)}
+    }
+    world += cannon
+    world ++= List.flatten(stack)
+    
+  }
+  
+  enableEvent = true
+  override def fireEvent() = blastBomb
+  
+  def blastBomb() = {
+    val bombPos = Vector2D(0, 0.56)
+    val bombRadius = 1
+    val bombImpulse = 200
+    val region = new Circle(bombRadius, 0) {pos = bombPos}
+    val detector = world.detector.asInstanceOf[sims.collision.GridDetector]
+    val collisions = for (s <- world.shapes; if detector.colliding(sims.collision.Pair(region, s))) yield detector.collision(sims.collision.Pair(region, s))
+    for (c <- collisions) {
+      if (c.shape1 != region)
+        for(p <- c.points) c.shape1.body.applyImpulse((p - bombPos).unit * bombImpulse, p)
+      if (c.shape2 != region)
+        for(p <- c.points) c.shape2.body.applyImpulse((p - bombPos).unit * bombImpulse, p)
+    }
+  }
+}
diff --git a/src/graphyx/tests/EmptyTest.scala b/src/graphyx/tests/EmptyTest.scala
index 585a053..0e3bd84 100644
--- a/src/graphyx/tests/EmptyTest.scala
+++ b/src/graphyx/tests/EmptyTest.scala
@@ -7,6 +7,7 @@
 package graphyx.tests
 
 import sims.dynamics._
+import sims.geometry._
 object EmptyTest extends Test{
   override val title = "Empty Test"
   val world = new World
diff --git a/src/graphyx/tests/Friction.scala b/src/graphyx/tests/Friction.scala
index 268d054..ba9fb69 100644
--- a/src/graphyx/tests/Friction.scala
+++ b/src/graphyx/tests/Friction.scala
@@ -47,6 +47,7 @@ object Friction extends Test{
     world += r3
   }
   
+  enableEvent = true
   override def fireEvent = {
     world -= r1
     world -= r2
diff --git a/src/graphyx/tests/Friction2.scala b/src/graphyx/tests/Friction2.scala
index f6731e2..9d03bd9 100644
--- a/src/graphyx/tests/Friction2.scala
+++ b/src/graphyx/tests/Friction2.scala
@@ -20,10 +20,10 @@ object Friction2 extends Test{
       friction = (i * 1.0 / 10)
       restitution = 0
     })
-    val ground = new Body(shapes: _*) //Rectangle(100, 0.1, 1).asBody
+    val ground = new Body(shapes: _*)
     ground.pos = Vector2D(0,0)
     ground.fixed = true
-    ground.rotation = -0.2
+    ground.rotation = -Math.Pi / 5
     world += ground
     
     val b: Body = (new Circle(0.1,10)) ~ (new Circle(0.1,10) {pos = Vector2D(0.2,0)}) ~ (new Circle(0.1,10) {pos = Vector2D(0.4,0)})
diff --git a/src/graphyx/tests/General1.scala b/src/graphyx/tests/General1.scala
index 7d8703b..71e041b 100644
--- a/src/graphyx/tests/General1.scala
+++ b/src/graphyx/tests/General1.scala
@@ -106,6 +106,7 @@ object General1 extends Test{
     world += (new Circle(0.1,1) {pos = Vector2D(2,2)}) ~ (new Circle(0.1,1) {pos = Vector2D(2,2.2)}) 
   }
   
+  enableEvent = true
   override def fireEvent() = blastBomb
   
   def blastBomb() = {
diff --git a/src/graphyx/tests/Spring.scala b/src/graphyx/tests/Spring.scala
index 439259f..e7fecb8 100644
--- a/src/graphyx/tests/Spring.scala
+++ b/src/graphyx/tests/Spring.scala
@@ -7,23 +7,14 @@ import java.io._
 
 object Spring extends Test{
   val title = "Spring"
-  //val fout = new java.io.FileOutputStream("out.csv")
-  //val sout = new java.io.PrintStream(fout)
-  val world = new World {
-    override def postStep = {
-      //for (b <- bodies; if (b.monitor)) sout.println(monitors(0)._2(b))
-    }
-  }
+  val world = new World
   
   def init = {
     val anchor = Circle(0.05, 10).asBody
     anchor.fixed = true
-    val particle = (new Circle(0.1, 10) {pos = Vector2D(0, -1)}).asBody
-    val spring = new SpringJoint(anchor, particle, 500, 0.6)
-    //val spring = new PrismaticJoint(anchor, particle)
-    spring.damping = 1
-    particle.monitor = true
-    world.monitors += ("", _.pos.y.toString)
+    val particle = (new Circle(0.1, 20) {pos = Vector2D(0, -3)}).asBody
+    val spring = new SpringJoint(anchor, particle, 500, 2)
+    spring.damping = 0.5
     
     world += anchor
     world += particle
diff --git a/src/graphyx/tests/Test.scala b/src/graphyx/tests/Test.scala
index b539283..ca0f8e8 100644
--- a/src/graphyx/tests/Test.scala
+++ b/src/graphyx/tests/Test.scala
@@ -11,6 +11,7 @@ trait Test {
   val world: World
   val title: String
   def init(): Unit
+  var enableEvent: Boolean = false
   def fireEvent(): Unit = println("No custom event method defined.")
   override def toString() = title
 }
diff --git a/src/graphyx/tests/Wave.scala b/src/graphyx/tests/Wave.scala
index 62ec194..d3359c1 100644
--- a/src/graphyx/tests/Wave.scala
+++ b/src/graphyx/tests/Wave.scala
@@ -11,17 +11,24 @@ object Wave extends Test{
   
   def init = {
     val n = 50
-    val anchors = for (i <- (0 to n).toList) yield (new Body(new Circle(0.01,1) {pos = Vector2D(0.4 * i, 5)}) {fixed = true})
-    val particles = for (i <- (0 to n).toList) yield (new Body(new Circle(0.1,10) {pos = Vector2D(0.4 * i, 0)}))
-    val rails = (for (i <- (0 to n).toList) yield (new PrismaticJoint(anchors(i), particles(i))))
-    val springs = (for (i <- (0 to n).toList) yield (new SpringJoint(anchors(i), particles(i), 5)))// {damping = 0.00}))
-    world ++= anchors
-    world ++= particles
-    for (j <- rails ++ springs) world += j
     
-    val lateralSprings = (for (i <- (0 to (n - 1)).toList) yield (new SpringJoint(particles(i), particles(i + 1), 50.0)))
-    for (j <- lateralSprings) world += j
+    val anchors = for (i <- (0 to n).toList) yield
+      new Body(new Circle(0.01,1) {pos = Vector2D(0.4 * i, 5)}) {fixed = true}
+    
+    val particles = for (i <- (0 to n).toList) yield
+      new Body(new Circle(0.1,10) {pos = Vector2D(0.4 * i, 0)})
+    
+    val rails = for (i <- (0 to n).toList) yield
+      new PrismaticJoint(anchors(i), particles(i))
+    
+    val springs = for (i <- (0 to n).toList) yield
+      new SpringJoint(anchors(i), particles(i), 5)// {damping = 0.00})
     
+    val lateralSprings = for (i <- (0 to (n - 1)).toList) yield
+      new SpringJoint(particles(i), particles(i + 1), 50.0)
+    
+    world ++= anchors
+    world ++= particles
+    for (j <- rails ++ springs ++ lateralSprings) world += j   
   }
-  
 }
diff --git a/src/sims/collision/AABB.scala b/src/sims/collision/AABB.scala
index ea696f2..f3a0b71 100644
--- a/src/sims/collision/AABB.scala
+++ b/src/sims/collision/AABB.scala
@@ -6,7 +6,7 @@
 
 package sims.collision
 
-import geometry._
+import sims.geometry._
 
 /**
  * Axis Aligned Bounding Boxes (AABBs) are rectangles that frame a shape.
diff --git a/src/sims/collision/CircleCollision.scala b/src/sims/collision/CircleCollision.scala
index e77c8e2..04cf2d7 100644
--- a/src/sims/collision/CircleCollision.scala
+++ b/src/sims/collision/CircleCollision.scala
@@ -6,8 +6,8 @@
 
 package sims.collision
 
-import geometry._
-import dynamics._
+import sims.geometry._
+import sims.dynamics._
 
 /**Collision between two circles.*/
 case class CircleCollision(c1: Circle, c2: Circle) extends Collision {
diff --git a/src/sims/collision/Collision.scala b/src/sims/collision/Collision.scala
index ce09ac2..540081a 100644
--- a/src/sims/collision/Collision.scala
+++ b/src/sims/collision/Collision.scala
@@ -6,8 +6,8 @@
 
 package sims.collision
 
-import dynamics._
-import geometry._
+import sims.dynamics._
+import sims.geometry._
 
 /**Collision between two shapes. Contains methods to compute the collision response.*/
 abstract class Collision extends Constraint {
diff --git a/src/sims/collision/Detector.scala b/src/sims/collision/Detector.scala
index 0a3ad5b..96af5dc 100644
--- a/src/sims/collision/Detector.scala
+++ b/src/sims/collision/Detector.scala
@@ -9,8 +9,6 @@ package sims.collision
 
 import sims.geometry._
 import sims.dynamics._
-import scala.collection._
-import scala.collection.mutable._
 
 /**A world detects its collisions through concrete implementations of this class.*/
 abstract class Detector {
diff --git a/src/sims/collision/GridDetector.scala b/src/sims/collision/GridDetector.scala
index f5ed99a..abc40f2 100644
--- a/src/sims/collision/GridDetector.scala
+++ b/src/sims/collision/GridDetector.scala
@@ -9,7 +9,8 @@ package sims.collision
 import sims.dynamics._
 import sims.geometry._
 import scala.collection._
-import scala.collection.mutable._
+import scala.collection.mutable.ArrayBuffer
+import scala.collection.mutable.HashMap
 
 /**A conrete implementation of <code>Detector</code>. <code>GridDetector</code> divides the world into a grid
  * for faster collision detection.*/
diff --git a/src/sims/collision/PolyCollision.scala b/src/sims/collision/PolyCollision.scala
index b4fa917..5296f41 100644
--- a/src/sims/collision/PolyCollision.scala
+++ b/src/sims/collision/PolyCollision.scala
@@ -9,7 +9,6 @@ package sims.collision
 import sims.geometry._
 import sims.dynamics._
 import scala.collection.mutable.Map
-import scala.collection.mutable._
 
 /**Collision between two convex polygons.*/
 case class PolyCollision(p1: ConvexPolygon, p2: ConvexPolygon) extends Collision {
diff --git a/src/sims/dynamics/World.scala b/src/sims/dynamics/World.scala
index 0230a50..f24a3fd 100644
--- a/src/sims/dynamics/World.scala
+++ b/src/sims/dynamics/World.scala
@@ -9,7 +9,7 @@ package sims.dynamics
 import sims.geometry._
 import sims.collision._
 import sims.dynamics.joints._
-import scala.collection.mutable._
+import scala.collection.mutable.ArrayBuffer
 
 /**A world contains and simulates a system of rigid bodies and joints.*/
 class World {
@@ -35,7 +35,7 @@ class World {
    * Example usage: monitors += ("Y-Position", _.pos.y.toString)
    * This will calculate all bodies - whose <code>monitor</code> field is set to
    * <code>true</code> - second position components.*/
-  val monitors = new ArrayBuffer[(String, Body => String)]
+  val monitors = new ArrayBuffer[(String, Body => Any)]
   
   /**Collsion detector who manages collision detection in this world.*/
   val detector: Detector = new GridDetector(this)
@@ -65,7 +65,7 @@ class World {
   def +=(joint: Joint): Unit = joints += joint
   
   /**Adds the given prefabricated system of bodies and joints to this world.*/
-  def +=(p: prefabs.Prefab): Unit = {
+  def +=(p: sims.prefabs.Prefab): Unit = {
     for (b <- p.bodies) this += b
     for (j <- p.joints) this += j
   }
@@ -80,7 +80,7 @@ class World {
   def -=(joint: Joint): Unit = joints -= joint
   
   /**Removes the given prefabricated system of bodies and joints from this world.*/
-  def -=(p: prefabs.Prefab): Unit = {
+  def -=(p: sims.prefabs.Prefab): Unit = {
     for (b <- p.bodies) this -= b
     for (j <- p.joints) this -= j
   }
@@ -113,12 +113,9 @@ class World {
     
     //integration of acclerations, yields velocities
     for (b <- bodies) {
-      val m = b.mass
       b.applyForce(gravity * b.mass)
-      val a = b.force / b.mass
-      val alpha = b.torque / b.I
-      b.linearVelocity = b.linearVelocity + a * timeStep
-      b.angularVelocity = b.angularVelocity + alpha * timeStep
+      b.linearVelocity = b.linearVelocity + (b.force / b.mass) * timeStep
+      b.angularVelocity = b.angularVelocity + (b.torque / b.I) * timeStep
     }
     
     //correction of velocities
diff --git a/src/sims/dynamics/joints/DistanceJoint.scala b/src/sims/dynamics/joints/DistanceJoint.scala
index efb49e5..1bf9b46 100644
--- a/src/sims/dynamics/joints/DistanceJoint.scala
+++ b/src/sims/dynamics/joints/DistanceJoint.scala
@@ -6,6 +6,7 @@
 
 package sims.dynamics.joints
 
+import sims.dynamics._
 import sims.geometry._
 
 /** DistanceJoints keep their connection points at a constant distance.
diff --git a/src/sims/dynamics/joints/SpringJoint.scala b/src/sims/dynamics/joints/SpringJoint.scala
index 1267ccf..4d44864 100644
--- a/src/sims/dynamics/joints/SpringJoint.scala
+++ b/src/sims/dynamics/joints/SpringJoint.scala
@@ -6,6 +6,7 @@
 
 package sims.dynamics.joints
 
+import sims.dynamics._
 import sims.geometry._
 
 /**A spring obeying Hooke's law.
diff --git a/src/sims/dynamics/joints/test/PrismaticJoint.scala b/src/sims/dynamics/joints/test/PrismaticJoint.scala
index d4b43b2..040647d 100644
--- a/src/sims/dynamics/joints/test/PrismaticJoint.scala
+++ b/src/sims/dynamics/joints/test/PrismaticJoint.scala
@@ -1,5 +1,7 @@
 package sims.dynamics.joints.test
 
+import sims.dynamics._
+import sims.dynamics.joints._
 import sims.geometry._
 
 case class PrismaticJoint(node1: Body, anchor1: Vector2D, node2: Body, anchor2: Vector2D) extends Joint{
diff --git a/src/sims/dynamics/joints/test/UnitCircleJoint.scala b/src/sims/dynamics/joints/test/UnitCircleJoint.scala
index 64f613c..09e72d9 100644
--- a/src/sims/dynamics/joints/test/UnitCircleJoint.scala
+++ b/src/sims/dynamics/joints/test/UnitCircleJoint.scala
@@ -7,6 +7,7 @@
 package sims.dynamics.joints.test
 
 import sims.dynamics._
+import sims.dynamics.joints._
 import sims.geometry._
 
 class UnitCircleJoint(body: Body, anchor: Vector2D) extends Joint{
-- 
cgit v1.2.3