Index: doc/next-tutorial/next-tutorial.html
===================================================================
diff -u -r26480a59b14cf250904da0cdc7d895f21b0ed5fd -rd00b7a9fa608e137faea6e52ded881b871d5c29e
--- doc/next-tutorial/next-tutorial.html	(.../next-tutorial.html)	(revision 26480a59b14cf250904da0cdc7d895f21b0ed5fd)
+++ doc/next-tutorial/next-tutorial.html	(.../next-tutorial.html)	(revision d00b7a9fa608e137faea6e52ded881b871d5c29e)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.7" />
+<meta name="generator" content="AsciiDoc 8.6.8" />
 <title>Tutorial for the Next Scripting Language</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -87,11 +87,15 @@
 ul > li     { color: #aaa; }
 ul > li > * { color: black; }
 
-pre {
+.monospaced, code, pre {
+  font-family: "Courier New", Courier, monospace;
+  font-size: inherit;
+  color: navy;
   padding: 0;
   margin: 0;
 }
 
+
 #author {
   color: #527bbd;
   font-weight: bold;
@@ -415,12 +419,6 @@
  *
  * */
 
-tt {
-  font-family: "Courier New", Courier, monospace;
-  font-size: inherit;
-  color: navy;
-}
-
 div.tableblock {
   margin-top: 1.0em;
   margin-bottom: 1.5em;
@@ -454,12 +452,6 @@
  *
  * */
 
-.monospaced {
-  font-family: "Courier New", Courier, monospace;
-  font-size: inherit;
-  color: navy;
-}
-
 table.tableblock {
   margin-top: 1.0em;
   margin-bottom: 1.5em;
@@ -539,6 +531,8 @@
 @media print {
   body.manpage div#toc { display: none; }
 }
+
+
 </style>
 <script type="text/javascript">
 /*<![CDATA[*/
@@ -739,8 +733,8 @@
 <div id="header">
 <h1>Tutorial for the Next Scripting Language</h1>
 <span id="author">Gustaf Neumann &lt;neumann@wu-wien.ac.at&gt;, Stefan Sobernig &lt;stefan.sobernig@wu.ac.at&gt;</span><br />
-<span id="revnumber">version 2.1,</span>
-<span id="revdate">March 2011</span>
+<span id="revnumber">version 2.2,</span>
+<span id="revdate">May 2013</span>
 <br /><span id="revremark">Written for the Initial Release of the Next Scripting Framework.</span>
 <div id="toc">
   <div id="toctitle">Table of Contents</div>
@@ -778,9 +772,9 @@
 the universal method combinator "next", which was introduced in XOTcl.
 The combinator "next" serves as a single instrument for method
 combination with filters, per-object and transitive per-class mixin
-classes, per-object methods and multiple inheritance.</p></div>
+classes, object methods and multiple inheritance.</p></div>
 <div class="paragraph"><p>The definition of NX is fully scripted (e.g.  defined in
-<tt>nx.tcl</tt>). The Next Scripting Framework is shipped with three language
+<code>nx.tcl</code>). The Next Scripting Framework is shipped with three language
 definitions, containing NX and XOTcl 2. Most of the existing XOTcl 1
 programs can be used without modification in the Next Scripting
 Framework by using XOTcl 2. The Next Scripting Framework requires Tcl
@@ -837,19 +831,19 @@
 <div class="paragraph"><p>A classical programming example is the implementation of a stack, which
 is most likely familiar to many readers from many introductory
 programming courses. A stack is a last-in first-out data structure
-which is manipulated via operations like <tt>push</tt> (add something to the
-stack) and <tt>pop</tt> remove an entry from the stack. These operations are
+which is manipulated via operations like <code>push</code> (add something to the
+stack) and <code>pop</code> remove an entry from the stack. These operations are
 called <em>methods</em> in the context of object oriented programming
 systems. Primary goals of object orientation are encapsulation and
 abstraction. Therefore, we define a common unit (a class) that defines
 and encapsulates the behavior of a stack and provides methods to a user
 of the data structure that abstract from the actual implementation.</p></div>
 <div class="sect2">
 <h3 id="_define_a_class_stack">2.1. Define a Class "Stack"</h3>
-<div class="paragraph"><p>In our first example, we define a class named <tt>Stack</tt> with the methods
-<tt>push</tt> and <tt>pop</tt>. When an instance of the stack is created (e.g. a
-concrete stack <tt>s1</tt>) the stack will contain an instance variable named
-<tt>things</tt>, initialized with the an empty list.</p></div>
+<div class="paragraph"><p>In our first example, we define a class named <code>Stack</code> with the methods
+<code>push</code> and <code>pop</code>. When an instance of the stack is created (e.g. a
+concrete stack <code>s1</code>) the stack will contain an instance variable named
+<code>things</code>, initialized with the an empty list.</p></div>
 <div class="paragraph" id="xmp-class-stack"><div class="title">Listing 2: Class Stack</div><p></p></div>
 <div class="listingblock">
 <div class="content"><style type='text/css'>
@@ -900,48 +894,48 @@
       <span class='nx-keyword'>return</span> <span class='nx-variable'>$top</span>
    }
 }</pre></td></tr></table></div></div>
-<div class="paragraph"><p>Typically, classes are defined in NX via <tt>nx::Class create</tt>, followed
-by the name of the new class (here: <tt>Stack</tt>). The definition of the
+<div class="paragraph"><p>Typically, classes are defined in NX via <code>nx::Class create</code>, followed
+by the name of the new class (here: <code>Stack</code>). The definition of the
 stack placed between curly braces and contains here just the method
-definitions. Methods of the class are defined via <tt>:method</tt> followed
+definitions. Methods of the class are defined via <code>:method</code> followed
 by the name of the method, an argument list and the body of the
 method, consisting of Tcl and NX statements.</p></div>
-<div class="paragraph"><p>When an instance of <tt>Stack</tt> is created, it will contain an instance
-variable named <tt>things</tt>. If several <tt>Stack</tt> instances are created,
+<div class="paragraph"><p>When an instance of <code>Stack</code> is created, it will contain an instance
+variable named <code>things</code>. If several <code>Stack</code> instances are created,
 each of the instances will have their own (same-named but different)
-instance variable. The instance variable <tt>things</tt> is used in our
+instance variable. The instance variable <code>things</code> is used in our
 example as a list for the internal representation of the stack. We
 define in a next step the methods to access and modify this list
 structure. A user of the stack using the provided methods does not
 have to have any knowledge about the name or the structure of the
-internal representation (the instance variable <tt>things</tt>).</p></div>
-<div class="paragraph"><p>The method <tt>push</tt> receives an argument <tt>thing</tt> which should be placed
+internal representation (the instance variable <code>things</code>).</p></div>
+<div class="paragraph"><p>The method <code>push</code> receives an argument <code>thing</code> which should be placed
 on the stack. Note that we do not have to specify the type of the
 element on the stack, so we can push strings as well as numbers or
 other kind of things. When an element is pushed, we add this element
-as the first element to the list <tt>things</tt>. We insert the element using
-the Tcl command <tt>linsert</tt> which receives the list as first element,
+as the first element to the list <code>things</code>. We insert the element using
+the Tcl command <code>linsert</code> which receives the list as first element,
 the position where the element should be added as second and the new
 element as third argument. To access the value of the instance
 variable we use Tcl&#8217;s dollar operator followed by the name. The
-names of instance variables are preceded with a colon <tt>:</tt>. Since the
+names of instance variables are preceded with a colon <code>:</code>. Since the
 name contains a non-plain character, Tcl requires us to put braces
-around the name. The command <tt>linsert</tt> and its arguments are placed
-between square brackets. This means that the function <tt>linsert</tt> is called and
+around the name. The command <code>linsert</code> and its arguments are placed
+between square brackets. This means that the function <code>linsert</code> is called and
 a new list is returned, where the new element is inserted at the first
-position (index 0) in the list <tt>things</tt>. The result of the <tt>linsert</tt>
-function is assigned again to the instance variable <tt>things</tt>, which is
-updated this way.  Finally the method <tt>push</tt> returns the pushed thing
-using the <tt>return</tt> statement.</p></div>
-<div class="paragraph"><p>The method <tt>pop</tt> returns the most recently stacked element and removes
+position (index 0) in the list <code>things</code>. The result of the <code>linsert</code>
+function is assigned again to the instance variable <code>things</code>, which is
+updated this way.  Finally the method <code>push</code> returns the pushed thing
+using the <code>return</code> statement.</p></div>
+<div class="paragraph"><p>The method <code>pop</code> returns the most recently stacked element and removes
 it from the stack. Therefore, it takes the first element from the list
-(using the Tcl command <tt>lindex</tt>), assigns it to the method-scoped
-variable <tt>top</tt>, removes the element from the instance variable
-<tt>things</tt> (by using the Tcl command <tt>lrange</tt>) and returns the value
-popped element <tt>top</tt>.</p></div>
+(using the Tcl command <code>lindex</code>), assigns it to the method-scoped
+variable <code>top</code>, removes the element from the instance variable
+<code>things</code> (by using the Tcl command <code>lrange</code>) and returns the value
+popped element <code>top</code>.</p></div>
 <div class="paragraph"><p>This finishes our first implementation of the stack, more enhanced
-versions will follow. Note that the methods <tt>push</tt> and <tt>pop</tt> are
-defined as <tt>public</tt>; this means that these methods can be
+versions will follow. Note that the methods <code>push</code> and <code>pop</code> are
+defined as <code>public</code>; this means that these methods can be
 used from all other objects in the system. Therefore, these methods
 provide an interface to the stack implementation.</p></div>
 <div class="paragraph" id="xmp-using-stack"><div class="title">Listing 3: Using the Stack</div><p></p></div>
@@ -994,24 +988,24 @@
 s1 <span class='nx-keyword'>destroy</span></pre></td></tr></table></div></div>
 <div class="paragraph"><p>Now we want to use the stack. The code snippet in <a href="#xmp-using-stack">Listing 3</a> shows how to use the class Stack in a script.
 Since NX is based on Tcl, the script will be called with the Tcl shell
-<tt>tclsh</tt>. In the Tcl shell we have to <tt>require package nx</tt> to use the
+<code>tclsh</code>. In the Tcl shell we have to <code>require package nx</code> to use the
 Next Scripting Framework and NX. The next lines contain the definition
 of the stack as presented before. Of course, it is as well possible to
 make the definition of the stack an own package, such we could simple
-say <tt>package require stack</tt>, or to save the definition of a stack
-simply in a file and load it via <tt>source</tt>.</p></div>
+say <code>package require stack</code>, or to save the definition of a stack
+simply in a file and load it via <code>source</code>.</p></div>
 <div class="paragraph"><p>In line 12 we create an instance of the stack, namely the stack object
-<tt>s1</tt>. The object <tt>s1</tt> is an instance of <tt>Stack</tt> and has therefore
-access to its methods. The methods like <tt>push</tt> or <tt>pop</tt> can be invoked
+<code>s1</code>. The object <code>s1</code> is an instance of <code>Stack</code> and has therefore
+access to its methods. The methods like <code>push</code> or <code>pop</code> can be invoked
 via a command starting with the object name followed by the
-method name. In lines 13-15 we push on the stack the values <tt>a</tt>, then
-<tt>b</tt>, and <tt>c</tt>. In line 16 we output the result of the <tt>pop</tt> method
-using the Tcl command <tt>puts</tt>. We will see on standard output the
+method name. In lines 13-15 we push on the stack the values <code>a</code>, then
+<code>b</code>, and <code>c</code>. In line 16 we output the result of the <code>pop</code> method
+using the Tcl command <code>puts</code>. We will see on standard output the
 value+c+ (the last stacked item). The output of the line 17 is the
-value <tt>b</tt> (the previously stacked item). Finally, in line 18 we
+value <code>b</code> (the previously stacked item). Finally, in line 18 we
 destroy the object. This is not necessary here, but shows the life
-cycle of an object. In some respects, <tt>destroy</tt> is the counterpart of
-<tt>create</tt> from line 12.</p></div>
+cycle of an object. In some respects, <code>destroy</code> is the counterpart of
+<code>create</code> from line 12.</p></div>
 <div class="imageblock" id="fig-class-object" style="text-align:center;">
 <div class="content">
 <img src="object-class-appclass.png" alt="object-class-appclass.png" />
@@ -1020,11 +1014,11 @@
 </div>
 <div class="paragraph"><p></p></div>
 <div class="paragraph"><p><a href="#fig-class-object">Figure 4</a> shows the actual class and
-object structure of the first <tt>Stack</tt> example. Note that the common
-root class is <tt>nx::Object</tt> that contains methods for all objects.
-Since classes are as well objects in NX, <tt>nx::Class</tt> is a
-specialization of <tt>nx::Object</tt>. <tt>nx::Class</tt> provides methods for
-creating objects, such as the method <tt>create</tt> which is used to create
+object structure of the first <code>Stack</code> example. Note that the common
+root class is <code>nx::Object</code> that contains methods for all objects.
+Since classes are as well objects in NX, <code>nx::Class</code> is a
+specialization of <code>nx::Object</code>. <code>nx::Class</code> provides methods for
+creating objects, such as the method <code>create</code> which is used to create
 objects (and classes as well).</p></div>
 </div>
 <div class="sect2">
@@ -1036,14 +1030,13 @@
 methods defined in the class in the instances of the class.</p></div>
 <div class="paragraph"><p>In our next example, we introduce <em>generic objects</em> and <em>object
 specific methods</em>. With NX, we can define generic objects, which are
-instances of the most generic class <tt>nx::Object</tt> (sometimes called
-"common root class"). <tt>nx::Object</tt> is predefined and contains a
-minimal set of methods applicable to all NX objects.</p></div>
-<div class="paragraph"><p>In our second example, we will define a generic object named <tt>stack</tt>
-and provide methods for this object. The methods defined in our first
-example were methods provided by a class for objects. Now we defined
-object specific methods, which are methods applicable only to the
-object for which they are defined.</p></div>
+instances of the most generic class <code>nx::Object</code> (sometimes called
+"common root class"). <code>nx::Object</code> is predefined and contains a
+minimal set of methods applicable to all NX objects.  In this example,
+we define a generic object named <code>stack</code> and provide methods for this
+object. The methods defined above were methods provided by a class for
+objects. Now we define object specific methods, which are methods
+applicable only to the object for which they are defined.</p></div>
 <div class="paragraph" id="xmp-object-stack"><div class="title">Listing 5: Object stack</div><p></p></div>
 <div class="listingblock">
 <div class="content"><style type='text/css'>
@@ -1073,59 +1066,64 @@
  15
 </pre></td><td class='nx-body'><pre class='nx'><span class='nx-keyword'>nx::Object</span> <span class='nx-keyword'>create</span> stack {
 
-   <span class='nx-keyword'>:variable</span> things {}
+   <span class='nx-keyword'>:object</span> <span class='nx-keyword'>variable</span> things {}
 
-   <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> push {thing} {
+   <span class='nx-keyword'>:public</span> <span class='nx-keyword'>object</span> <span class='nx-keyword'>method</span> push {thing} {
       <span class='nx-keyword'>set</span> :things [<span class='nx-keyword'>linsert</span> <span class='nx-variable'>${</span><span class='nx-variable'>:things}</span> 0 <span class='nx-variable'>$thing</span>]
       <span class='nx-keyword'>return</span> <span class='nx-variable'>$thing</span>
    }
 
-   <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> pop {} {
+   <span class='nx-keyword'>:public</span> <span class='nx-keyword'>object</span> <span class='nx-keyword'>method</span> pop {} {
       <span class='nx-keyword'>set</span> top [<span class='nx-keyword'>lindex</span> <span class='nx-variable'>${</span><span class='nx-variable'>:things}</span> 0]
       <span class='nx-keyword'>set</span> :things [<span class='nx-keyword'>lrange</span> <span class='nx-variable'>${</span><span class='nx-variable'>:things}</span> 1 end]
       <span class='nx-keyword'>return</span> <span class='nx-variable'>$top</span>
    }
 }</pre></td></tr></table></div></div>
 <div class="paragraph"><p>The example in <a href="#xmp-object-stack">Listing 5</a> defines the
-object <tt>stack</tt> in a very similar way as the class <tt>Stack</tt>. But the
+object <code>stack</code> in a very similar way as the class <code>Stack</code>. But the
 following points are different.</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-First, we use <tt>nx::Object</tt> instead of <tt>nx::Class</tt> to denote
+First, we use <code>nx::Object</code> instead of <code>nx::Class</code> to denote
   that we want to create a generic object, not a class.
 </p>
 </li>
 <li>
 <p>
-As in the example above, we use <tt>:variable</tt> to define the
-  instance variable <tt>things</tt> for this object (the object <tt>stack</tt>).
+We use <code>:object variable</code> to define the variable <code>things</code>  just for
+   this single instance  (the object <code>stack</code>).
 </p>
 </li>
+<li>
+<p>
+The definition for the methods <code>push</code> and <code>pop</code> are the same as
+  before, but here we defined these with <code>object method</code>. Therefore,
+  these two methods <code>push</code> and <code>pop</code> are object-specific.
+</p>
+</li>
 </ul></div>
-<div class="paragraph"><p>The definition for the methods <tt>push</tt> and <tt>pop</tt> are the same as
-before, but this times these methods are object-specific (in general,
-all methods defined for an object are object-specific). In order to use
-the stack, we can use directly the object <tt>stack</tt> in the same way as
-we have used the object <tt>s1</tt> in <a href="#xmp-using-stack">Listing 3</a>
-the class diagram for this the object <tt>stack</tt>.</p></div>
+<div class="paragraph"><p>In order to use
+the stack, we can use directly the object <code>stack</code> in the same way as
+we have used the object <code>s1</code> in <a href="#xmp-using-stack">Listing 3</a>
+the class diagram for this the object <code>stack</code>.</p></div>
 <div class="imageblock" id="img-object-stack" style="text-align:center;">
 <div class="content">
 <img src="object-stack.png" alt="object-stack.png" />
 </div>
 <div class="title">Figure 6. Object stack</div>
 </div>
 <div class="paragraph"><p></p></div>
-<div class="paragraph"><p>A reader might wonder when to use a class <tt>Stack</tt> or rather an object
-<tt>stack</tt>. A big difference is certainly that one can define easily
+<div class="paragraph"><p>A reader might wonder when to use a class <code>Stack</code> or rather an object
+<code>stack</code>. A big difference is certainly that one can define easily
 multiple instances of a class, while the object is actually a
-singleton. The concept of the object <tt>stack</tt> is similar to a module,
+single, tailored entity. The concept of the object <code>stack</code> is similar to a module,
 providing a certain functionality via a common interface, without
 providing the functionality to create multiple instances. The reuse of
 methods provided by the class to objects is as well a difference. If
 the methods of the class are updated, all instances of the class will
 immediately get the modified behavior. However, this does not mean that
-the reuse for the methods of <tt>stack</tt> is not possible. NX allows for
+the reuse for the methods of <code>stack</code> is not possible. NX allows for
 example to copy objects (similar to prototype based languages) or to
 reuse methods via e.g. aliases (more about this later).</p></div>
 <div class="paragraph"><p>Note that we use capitalized names for classes and lowercase names for
@@ -1136,15 +1134,15 @@
 <h3 id="_implementing_features_using_mixin_classes">2.3. Implementing Features using Mixin Classes</h3>
 <div class="paragraph"><p>So far, the definition of the stack methods was pretty minimal.
 Suppose, we want to define "safe stacks" that protect e.g. against
-stack under-runs (a stack under-run happens, when more <tt>pop</tt> than
-<tt>push</tt> operations are issued on a stack). Safety checking can be
+stack under-runs (a stack under-run happens, when more <code>pop</code> than
+<code>push</code> operations are issued on a stack). Safety checking can be
 implemented mostly independent from the implementation details of the
 stack (usage of internal data structures). There are as well different
 ways of checking the safety. Therefore we say that safety checking is
 orthogonal to the stack core implementation.</p></div>
 <div class="paragraph"><p>With NX we can define stack-safety as a separate class using methods
 with the same names as the implementations before, and "mix" this
-behavior into classes or objects. The implementation of <tt>Safety</tt> in
+behavior into classes or objects. The implementation of <code>Safety</code> in
 stack under-runs and to issue error messages, when this happens.</p></div>
 <div class="paragraph" id="xmp-class-safety"><div class="title">Listing 7: Class Safety</div><p></p></div>
 <div class="listingblock">
@@ -1206,18 +1204,18 @@
     <span class='nx-keyword'>next</span>
   }
 }</pre></td></tr></table></div></div>
-<div class="paragraph"><p>Note that all the methods of the class <tt>Safety</tt> end with <tt>next</tt>.
+<div class="paragraph"><p>Note that all the methods of the class <code>Safety</code> end with <code>next</code>.
 This command is a primitive command of NX, which calls the
 same-named method with the same argument list as the current
 invocation.</p></div>
-<div class="paragraph"><p>Assume we save the definition of the class <tt>Stack</tt> in a file named
-<tt>Stack.tcl</tt> and the definition of the class <tt>Safety</tt> in a file named
-<tt>Safety.tcl</tt> in the current directory. When we load the classes
-<tt>Stack</tt> and <tt>Safety</tt> into the same script (see the terminal dialog in
-e.g. a certain stack <tt>s2</tt> as a safe stack, while all other stacks
-(such as <tt>s1</tt>) might be still "unsafe". This can be achieved via the
-option <tt>-mixin</tt> at the object creation time (see line 9 in
-option <tt>-mixin</tt> mixes the class <tt>Safety</tt> into the new instance <tt>s2</tt>.</p></div>
+<div class="paragraph"><p>Assume we save the definition of the class <code>Stack</code> in a file named
+<code>Stack.tcl</code> and the definition of the class <code>Safety</code> in a file named
+<code>Safety.tcl</code> in the current directory. When we load the classes
+<code>Stack</code> and <code>Safety</code> into the same script (see the terminal dialog in
+e.g. a certain stack <code>s2</code> as a safe stack, while all other stacks
+(such as <code>s1</code>) might be still "unsafe". This can be achieved via the
+option <code>-mixin</code> at the object creation time (see line 9 in
+option <code>-mixin</code> mixes the class <code>Safety</code> into the new instance <code>s2</code>.</p></div>
 <div class="paragraph" id="xmp-using-class-safety"><div class="title">Listing 8: Using the Class Safety</div><p></p></div>
 <div class="listingblock">
 <div class="content"><style type='text/css'>
@@ -1260,7 +1258,7 @@
 ::Safety
 % Stack <span class='nx-keyword'>create</span> s1
 ::s1
-% Stack <span class='nx-keyword'>create</span> s2 -mixin Safety
+% Stack <span class='nx-keyword'>create</span> s2 -object-mixin Safety
 ::s2
 % s2 push a
 a
@@ -1274,35 +1272,38 @@
 
 % s2 <span class='nx-keyword'>info</span> precedence
 ::Safety ::Stack ::nx::Object</pre></td></tr></table></div></div>
-<div class="paragraph"><p>When the method <tt>push</tt> of <tt>s2</tt> is called, first the method of the
-mixin class <tt>Safety</tt> will be invoked that increments the counter and
-continues with <tt>next</tt> to call the shadowed method, here the method
-<tt>push</tt> of the <tt>Stack</tt> implementation that actually pushes the item.
-The same happens, when <tt>s2 pop</tt> is invoked, first the method of
-<tt>Safety</tt> is called, then the method of the <tt>Stack</tt>. When the stack is
-empty (the value of <tt>count</tt> reaches 0), and <tt>pop</tt> is invoked, the
-mixin class <tt>Safety</tt> generates an error message (raises an exception),
-and does not invoke the method of the <tt>Stack</tt>.</p></div>
-<div class="paragraph"><p>The last two commands in <a href="#xmp-using-class-safety">Listing 8</a> use introspection to query for the objects
-<tt>s1</tt> and <tt>s2</tt> in which order the involved classes are processed. This
-order is called the <tt>precedence order</tt> and is obtained via <tt>info
-precedence</tt>. We see that the mixin class <tt>Safety</tt> is only in use for
-<tt>s2</tt>, and takes there precedence over <tt>Stack</tt>. The common root class
-<tt>nx::Object</tt> is for both <tt>s1</tt> and <tt>s2</tt> the base class.</p></div>
+<div class="paragraph"><p>When the method <code>push</code> of <code>s2</code> is called, first the method of the
+mixin class <code>Safety</code> will be invoked that increments the counter and
+continues with <code>next</code> to call the shadowed method, here the method
+<code>push</code> of the <code>Stack</code> implementation that actually pushes the item.
+The same happens, when <code>s2 pop</code> is invoked, first the method of
+<code>Safety</code> is called, then the method of the <code>Stack</code>. When the stack is
+empty (the value of <code>count</code> reaches 0), and <code>pop</code> is invoked, the
+mixin class <code>Safety</code> generates an error message (raises an exception),
+and does not invoke the method of the <code>Stack</code>.</p></div>
+<div class="paragraph"><p>The last two commands in
+<a href="#xmp-using-class-safety">Listing 8</a>
+use introspection to query for the objects
+<code>s1</code> and <code>s2</code> in which order the involved classes are processed. This
+order is called the <code>precedence order</code> and is obtained via <code>info
+precedence</code>. We see that the mixin class <code>Safety</code> is only in use for
+<code>s2</code>, and takes there precedence over <code>Stack</code>. The common root class
+<code>nx::Object</code> is for both <code>s1</code> and <code>s2</code> the base class.</p></div>
 <div class="imageblock" id="img-per-object-mixin" style="text-align:center;">
 <div class="content">
 <img src="per-object-mixin.png" alt="per-object-mixin.png" />
 </div>
 <div class="title">Figure 9. Per-object Mixin</div>
 </div>
 <div class="paragraph"><p></p></div>
-<div class="paragraph"><p>Note that the class <tt>Safety</tt> is only mixed into a single object (here
-<tt>s2</tt>), therefore we refer to this case as a <em>per-object mixin</em>.
+<div class="paragraph"><p>Note that in <a href="#xmp-using-class-safety">Listing 8</a>,
+the class <code>Safety</code> is only mixed into a single object (here
+<code>s2</code>), therefore we refer to this case as a <em>per-object mixin</em>.
 <a href="#img-per-object-mixin">Figure 9</a> shows the class
-diagram, where the class <tt>Safety</tt> is used as a per-object mixin for
-<tt>s2</tt>.</p></div>
-<div class="paragraph"><p>The class <tt>Safety</tt> can be used as well in other ways, such as e.g. for
-defining classes for safe stacks &lt;&lt;xmp-class-safestack,</p></div>
+diagram, where the class <code>Safety</code> is used as a per-object mixin for
+<code>s2</code>.</p></div>
+<div class="paragraph"><p>The mixin class <code>Safety</code> can be used as well in other ways, such as e.g. for
+defining classes of safe stacks:</p></div>
 <div class="paragraph" id="xmp-class-safestack"><div class="title">Listing 10: Class SafeStack</div><p></p></div>
 <div class="listingblock">
 <div class="content"><style type='text/css'>
@@ -1329,28 +1330,32 @@
 </span><span class='nx-keyword'>nx::Class</span> <span class='nx-keyword'>create</span> SafeStack -superclass Stack -mixin Safety
 
 SafeStack <span class='nx-keyword'>create</span> s3</pre></td></tr></table></div></div>
-<div class="paragraph"><p>The difference to the case with the per-object mixin is that now,
-<tt>Safety</tt> is mixed into the definition of <tt>SafeStack</tt>. Therefore, all
-instances of the class <tt>SafeStack</tt> (here the instance <tt>s3</tt>) will be
-using the safety definitions.
-for this definition.</p></div>
+<div class="paragraph"><p>The difference of a per-class mixin and an per-object mixin is that
+the per-class mixin is applicable to all instances of the
+class. Therefore, we call these mixins also sometimes instance mixins.
+In our example in <a href="#xmp-class-safestack">Listing 10</a>,
+<code>Safety</code> is mixed into the definition of
+<code>SafeStack</code>. Therefore, all instances of the class <code>SafeStack</code> (here
+the instance <code>s3</code>) will be using the safety definitions.</p></div>
 <div class="imageblock" id="img-per-class-mixin" style="text-align:center;">
 <div class="content">
 <img src="per-class-mixin.png" alt="per-class-mixin.png" />
 </div>
 <div class="title">Figure 11. Per-class Mixin</div>
 </div>
 <div class="paragraph"><p></p></div>
-<div class="paragraph"><p>Note that we could use <tt>Safety</tt> as well as a per-class mixin on
-<tt>Stack</tt>. In this case, all stacks would be safe stacks and we could
+<div class="paragraph"><p><a href="#img-per-class-mixin">Figure 11</a> shows the class diagram
+for this definition.
+Note that we could use <code>Safety</code> as well as a per-class mixin on
+<code>Stack</code>. In this case, all stacks would be safe stacks and we could
 not provide a selective feature selection (which might be perfectly
 fine).</p></div>
 </div>
 <div class="sect2">
 <h3 id="_define_different_kinds_of_stacks">2.4. Define Different Kinds of Stacks</h3>
-<div class="paragraph"><p>The definition of <tt>Stack</tt> is generic and allows all kind of elements
+<div class="paragraph"><p>The definition of <code>Stack</code> is generic and allows all kind of elements
 to be stacked. Suppose, we want to use the generic stack definition,
-but a certain stack (say, stack <tt>s4</tt>) should be a stack for integers
+but a certain stack (say, stack <code>s4</code>) should be a stack for integers
 only. This behavior can be achieved by the same means as introduced
 already in <a href="#xmp-object-stack">Listing 5</a>, namely
 object-specific methods.</p></div>
@@ -1384,23 +1389,23 @@
 </span>  <span class='nx-comment'># to check the type of entries
 </span>  <span class='nx-comment'>#
 </span>
-  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> push {thing:integer} {
+  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>object</span> <span class='nx-keyword'>method</span> push {thing:integer} {
     <span class='nx-keyword'>next</span>
   }
 }</pre></td></tr></table></div></div>
-<div class="paragraph"><p>The program snippet in <a href="#xmp-object-integer-stack">Listing 12</a> defines an instance <tt>s4</tt> of the class
-<tt>Stack</tt> and provides an object specific method for <tt>push</tt> to implement
-an integer stack. The method <tt>pull</tt> is the same for the integer stack
+<div class="paragraph"><p>The program snippet in <a href="#xmp-object-integer-stack">Listing 12</a> defines an instance <code>s4</code> of the class
+<code>Stack</code> and provides an object specific method for <code>push</code> to implement
+an integer stack. The method <code>pull</code> is the same for the integer stack
 as for all other stacks, so it will be reused as usual from the class
-<tt>Stack</tt>. The object-specific method <tt>push</tt> of <tt>s4</tt> has a value
-constraint in its argument list (<tt>thing:integer</tt>) that makes sure,
+<code>Stack</code>. The object-specific method <code>push</code> of <code>s4</code> has a value
+constraint in its argument list (<code>thing:integer</code>) that makes sure,
 that only integers can be stacked. In case the argument is not an
 integer, an exception will be raised. Of course, one could perform the
-value constraint checking as well in the body of the method <tt>proc</tt> by
+value constraint checking as well in the body of the method <code>proc</code> by
 accepting an generic argument and by performing the test for the value
 in the body of the method. In the case, the passed value is an
-integer, the <tt>push</tt> method of <a href="#xmp-object-integer-stack">Listing 12</a> calls <tt>next</tt>, and therefore calls the
-shadowed generic definition of <tt>push</tt> as provided by <tt>Stack</tt>.</p></div>
+integer, the <code>push</code> method of <a href="#xmp-object-integer-stack">Listing 12</a> calls <code>next</code>, and therefore calls the
+shadowed generic definition of <code>push</code> as provided by <code>Stack</code>.</p></div>
 <div class="paragraph" id="xmp-class-integer-stack"><div class="title">Listing 13: Class IntegerStack</div><p></p></div>
 <div class="listingblock">
 <div class="content"><style type='text/css'>
@@ -1435,27 +1440,24 @@
 }</pre></td></tr></table></div></div>
 <div class="paragraph"><p>An alternative approach is shown in
 <a href="#xmp-class-integer-stack">Listing 13</a>, where the class
-<tt>IntegerStack</tt> is defined, using the same method definition
-as <tt>s4</tt>, this time on the class level.</p></div>
+<code>IntegerStack</code> is defined, using the same method definition
+as <code>s4</code>, this time on the class level.</p></div>
 </div>
 <div class="sect2">
-<h3 id="_define_class_specific_methods">2.5. Define Class Specific Methods</h3>
+<h3 id="_define_object_specific_methods_on_classes">2.5. Define Object Specific Methods on Classes</h3>
 <div class="paragraph"><p>In our previous examples we defined methods provided by classes
 (applicable for their instances) and object-specific methods (methods
 defined on objects, which are only applicable for these objects). In
-this section, we introduce methods that are defined on classes. These
-method are only applicable for the class objects. Such methods are
-sometimes called <em>class methods</em> or <em>static methods</em>.</p></div>
-<div class="paragraph"><p>In NX classes are objects with certain properties. The classes are
-objects providing methods for instance and which are managing the
-life-cycles of the objects (we will come to this point in later
-sections in more detail). Since classes are objects, it is also
-possible to define object-specific methods for the class
-objects. However, since <tt>:method</tt> applied on classes defines methods
-for instances, we have to use the method-modifier <tt>class</tt> to denote
-methods to be applied on the class itself. Note that instances do not
-inherit class methods. The methods defined on the class object are
-actually exactly same as the object-specific methods shown in the
+this section, we introduce methods that are defined on the class
+objects. Such methods are sometimes called <em>class methods</em> or
+<em>static methods</em>.</p></div>
+<div class="paragraph"><p>In NX classes are objects, they are specialized objects with
+additional methods. Methods for classes are often used for managing
+the life-cycles of the instances of the classes (we will come to this
+point in later sections in more detail). Since classes are objects, we
+can use exactly the same notation as above to define class methods by
+using <code>object method</code>. The methods defined on the class object are
+in all respects idential with object specific methods shown in the
 examples above.</p></div>
 <div class="paragraph" id="xmp-stack2"><div class="title">Listing 14: Class Stack2</div><p></p></div>
 <div class="listingblock">
@@ -1495,7 +1497,7 @@
  24
 </pre></td><td class='nx-body'><pre class='nx'><span class='nx-keyword'>nx::Class</span> <span class='nx-keyword'>create</span> Stack2 {
 
-   <span class='nx-keyword'>:public</span> <span class='nx-keyword'>class</span> <span class='nx-keyword'>method</span> available_stacks {} {
+   <span class='nx-keyword'>:public</span> <span class='nx-keyword'>object</span> <span class='nx-keyword'>method</span> available_stacks {} {
       <span class='nx-keyword'>return</span> [<span class='nx-keyword'>llength</span> [<span class='nx-keyword'>:info</span> instances]]
    }
 
@@ -1517,10 +1519,10 @@
 Stack2 <span class='nx-keyword'>create</span> s2
 
 <span class='nx-keyword'>puts</span> [Stack2 available_stacks]</pre></td></tr></table></div></div>
-<div class="paragraph"><p>The class <tt>Stack2</tt> in <a href="#xmp-stack2">Listing 14</a> consists of the
-earlier definition of the class <tt>Stack</tt> and is extended by the
-class-specific method <tt>available_stacks</tt>, which returns the
-current number of instances of the stack. The final command <tt>puts</tt>
+<div class="paragraph"><p>The class <code>Stack2</code> in <a href="#xmp-stack2">Listing 14</a> consists of the
+earlier definition of the class <code>Stack</code> and is extended by the
+class-specific method <code>available_stacks</code>, which returns the
+current number of instances of the stack. The final command <code>puts</code>
 (line 26) prints 2 to the console.</p></div>
 <div class="imageblock" id="img-stack2" style="text-align:center;">
 <div class="content">
@@ -1531,8 +1533,8 @@
 <div class="paragraph"><p></p></div>
 <div class="paragraph"><p>The class diagram in <a href="#img-stack2">Figure 15</a> shows the
 diagrammatic representation of the class object-specific method
-<tt>available_stacks</tt>.  Since every class is a specialization of the
-common root class <tt>nx::Object</tt>, the common root class is often omitted
+<code>available_stacks</code>.  Since every class is a specialization of the
+common root class <code>nx::Object</code>, the common root class is often omitted
 from the class diagrams, so it was omitted here as well in the diagram.</p></div>
 </div>
 </div>
@@ -1544,25 +1546,25 @@
 <h3 id="_variables_and_properties">3.1. Variables and Properties</h3>
 <div class="paragraph"><p>In general, NX does not need variable declarations. It allows to
 create or modify variables on the fly by using for example the Tcl
-commands <tt>set</tt> and <tt>unset</tt>. Depending on the variable name (or more
+commands <code>set</code> and <code>unset</code>. Depending on the variable name (or more
 precisely, depending on the variable name&#8217;s prefix consisting of
-colons <tt>:</tt>) a variable is either local to a method, or it is an
+colons <code>:</code>) a variable is either local to a method, or it is an
 instance variable, or a global variable.  The rules are:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
 A variable without any colon prefix refers typically to a method
    scoped variable. Such a variable is created during the invocation
    of the method, and it is deleted, when the method ends.  In the
-   example below, the variable <tt>a</tt> is method scoped.
+   example below, the variable <code>a</code> is method scoped.
 </p>
 </li>
 <li>
 <p>
 A variable with a single colon prefix refers to an instance
     variable.  An instance variable is part of the object; when the
     object is destroyed, its instance variables are deleted as well. In the
-    example below, the variable <tt>b</tt> is an instance variable.
+    example below, the variable <code>b</code> is an instance variable.
 </p>
 </li>
 <li>
@@ -1571,7 +1573,7 @@
   lifespan of a globale variable ends when the variable is explicitly
   unset or the script terminates. Variables, which are placed in Tcl
   namespaces, are also global variables. In the example below, the
-  variable <tt>c</tt> is a global variable.
+  variable <code>c</code> is a global variable.
 </p>
 </li>
 </ul></div>
@@ -1609,8 +1611,8 @@
 </span>    <span class='nx-keyword'>set</span> ::c 3
   }
 }</pre></td></tr></table></div></div>
-<div class="paragraph"><p><a href="#xmp-var-resolver">Listing 16</a> shows a method <tt>foo</tt>
-of some class <tt>Foo</tt> referring to differently scoped variables.</p></div>
+<div class="paragraph"><p><a href="#xmp-var-resolver">Listing 16</a> shows a method <code>foo</code>
+of some class <code>Foo</code> referring to differently scoped variables.</p></div>
 <div class="sect3">
 <h4 id="_properties_instance_variables_with_accessors">3.1.1. Properties: Instance Variables with Accessors</h4>
 <div class="paragraph"><p>Generally, there is no need to define or declare instance variables in
@@ -1633,8 +1635,8 @@
 <div class="title">Figure 17. Classes Person and Student</div>
 </div>
 <div class="paragraph"><p></p></div>
-<div class="paragraph"><p>The class diagram above defines the classes <tt>Person</tt> and
-<tt>Student</tt>. For both classes, accessor methods are specified with the
+<div class="paragraph"><p>The class diagram above defines the classes <code>Person</code> and
+<code>Student</code>. For both classes, accessor methods are specified with the
 same names as the attributes. (Note that we show the accessor methods
 only in this example, we omit it in later ones). By defining
 properties we can use the name of the attribute as method name to
@@ -1706,39 +1708,39 @@
 
 <span class='nx-comment'># Access property value via accessor method
 </span><span class='nx-keyword'>puts</span> <span class='nx-string'>"The name of s1 is [s1 name]"</span></pre></td></tr></table></div></div>
-<div class="paragraph"><p>By defining <tt>name</tt> and <tt>birthday</tt> as properties of <tt>Person</tt>, NX
+<div class="paragraph"><p>By defining <code>name</code> and <code>birthday</code> as properties of <code>Person</code>, NX
 provides automatically accessor methods with the same name.  The
 accessors methods (or shortly called "accessors") provide read and
 write access to the underlying instance variables. In our example, the
-class <tt>Person</tt> has two methods implied by the <tt>property</tt> definition:
-the method <tt>name</tt> and the method <tt>birthday</tt>.</p></div>
-<div class="paragraph"><p>The class <tt>Student</tt> is defined as a specialization of <tt>Person</tt> with
-two additional properties: <tt>matnr</tt> and <tt>oncampus</tt>. The property
-<tt>matnr</tt> is required (it has to be provided, when an instance of this
-class is created), and the property <tt>oncampus</tt> is boolean, and is per
-default set to <tt>true</tt>. Note that the class <tt>Student</tt> inherits the
-properties of <tt>Person</tt>. So, <tt>Student</tt> has four properties in total.</p></div>
-<div class="paragraph"><p>The property definitions are also used to providing <tt>object
-parameters</tt>. These are typically non-positional parameters, which are
+class <code>Person</code> has two methods implied by the <code>property</code> definition:
+the method <code>name</code> and the method <code>birthday</code>.</p></div>
+<div class="paragraph"><p>The class <code>Student</code> is defined as a specialization of <code>Person</code> with
+two additional properties: <code>matnr</code> and <code>oncampus</code>. The property
+<code>matnr</code> is required (it has to be provided, when an instance of this
+class is created), and the property <code>oncampus</code> is boolean, and is per
+default set to <code>true</code>. Note that the class <code>Student</code> inherits the
+properties of <code>Person</code>. So, <code>Student</code> has four properties in total.</p></div>
+<div class="paragraph"><p>The property definitions are also used to providing <code>object
+parameters</code>. These are typically non-positional parameters, which are
 used during object creation to supply values to the instance
-variables. In our listing, we create an instance of <tt>Person</tt> using the
-object parameter <tt>name</tt> and provide the value of <tt>Bob</tt> to the instance
-variable <tt>name</tt>.  Similarly, we create an instance of <tt>Student</tt> using
-the two object parameters <tt>name</tt> and <tt>matnr</tt>. Finally, we use the
-accessor method <tt>name</tt> to obtain the value of the instance variable
-<tt>name</tt> of object <tt>s1</tt>.</p></div>
+variables. In our listing, we create an instance of <code>Person</code> using the
+object parameter <code>name</code> and provide the value of <code>Bob</code> to the instance
+variable <code>name</code>.  Similarly, we create an instance of <code>Student</code> using
+the two object parameters <code>name</code> and <code>matnr</code>. Finally, we use the
+accessor method <code>name</code> to obtain the value of the instance variable
+<code>name</code> of object <code>s1</code>.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_instance_variables_without_accessors">3.1.2. Instance Variables without Accessors</h4>
 <div class="paragraph"><p>To define instances variables with default values without accessors
-the predefined method <tt>variable</tt> can be used. Such instance variables
+the predefined method <code>variable</code> can be used. Such instance variables
 are often used for e.g. keeping the internal state of an object.  The
-usage of <tt>variable</tt> is in many respects similar to <tt>property</tt>. One
-difference is, that <tt>property</tt> uses the same syntax as for method
-parameters, whereas <tt>variable</tt> receives the default value as a separate
-argument (similar to the <tt>variable</tt> command in Tcl). The introductory
+usage of <code>variable</code> is in many respects similar to <code>property</code>. One
+difference is, that <code>property</code> uses the same syntax as for method
+parameters, whereas <code>variable</code> receives the default value as a separate
+argument (similar to the <code>variable</code> command in Tcl). The introductory
 Stack example in <a href="#xmp-class-stack">Listing 2</a> uses already
-the method <tt>variable</tt>.</p></div>
+the method <code>variable</code>.</p></div>
 <div class="paragraph" id="xmp-variable"><div class="title">Listing 19: Declaring Variables</div><p></p></div>
 <div class="listingblock">
 <div class="content"><style type='text/css'>
@@ -1783,8 +1785,8 @@
 </span><span class='nx-comment'># x == 1 and y == 2</span></pre></td></tr></table></div></div>
 <div class="paragraph"><p>Note that the variable definitions are inherited in the same way as
 properties. The example in <a href="#xmp-variable">Listing 19</a> shows a
-class <tt>Derived</tt> that inherits from <tt>Base</tt>. When an instance <tt>d1</tt> is
-created, it will contain the two instance variables <tt>x</tt> and <tt>y</tt>.</p></div>
+class <code>Derived</code> that inherits from <code>Base</code>. When an instance <code>d1</code> is
+created, it will contain the two instance variables <code>x</code> and <code>y</code>.</p></div>
 <div class="paragraph" id="xmp-constructor"><div class="title">Listing 20: Setting Variables in the Constructor</div><p></p></div>
 <div class="listingblock">
 <div class="content"><style type='text/css'>
@@ -1836,11 +1838,11 @@
 <span class='nx-comment'># Create instance of the class Derived2
 </span>Derived2 <span class='nx-keyword'>create</span> d2</pre></td></tr></table></div></div>
 <div class="paragraph"><p>In many other object oriented languages, the instance variables are
-initialized solely by the constructor (similar to class <tt>Derived2</tt> in
+initialized solely by the constructor (similar to class <code>Derived2</code> in
 <a href="#xmp-constructor">Listing 20</a>). This approach is certainly
 also possible in NX. Note that the approach using constructors
 requires an explicit method chaining between the constructors and is
-less declarative than the approach in NX using <tt>property</tt> and <tt>variable</tt>.</p></div>
+less declarative than the approach in NX using <code>property</code> and <code>variable</code>.</p></div>
 </div>
 </div>
 <div class="sect2">
@@ -1904,21 +1906,21 @@
 
 <span class='nx-comment'># The following line prints "::fido Bark, bark, bark."
 </span>fido bark</pre></td></tr></table></div></div>
-<div class="paragraph"><p>In the example above we create a class <tt>Dog</tt> with a scripted method
-named <tt>bark</tt>. The method body defines the code, which is executed when
-the method is invoked. In this example, the method <tt>bar</tt> prints out a
+<div class="paragraph"><p>In the example above we create a class <code>Dog</code> with a scripted method
+named <code>bark</code>. The method body defines the code, which is executed when
+the method is invoked. In this example, the method <code>bar</code> prints out a
 line on the terminal starting with the object name (this is determined
-by the built in command <tt>self</tt>) followed by "Bark, bark, bark.".  This
+by the built in command <code>self</code>) followed by "Bark, bark, bark.".  This
 method is defined on a class and applicable to instances of the class
-(here the instance <tt>fido</tt>).</p></div>
+(here the instance <code>fido</code>).</p></div>
 </div>
 <div class="sect3">
 <h4 id="_c_implemented_methods">3.2.2. C-implemented Methods</h4>
 <div class="paragraph"><p>Not all of the methods usable in NX are scripted methods; many
 predefined methods are defined in the underlying system language,
 which is typically C.  For example, in <a href="#xmp-fido1">Listing 21</a> we
-used the method <tt>create</tt> to create the class <tt>Dog</tt> and to create the
-dog instance <tt>fido</tt>. These methods are implemented in C in the next
+used the method <code>create</code> to create the class <code>Dog</code> and to create the
+dog instance <code>fido</code>. These methods are implemented in C in the next
 scripting framework.</p></div>
 <div class="paragraph"><p>C-implemented methods are not only provided by the underlying
 framework but might be as well defined by application developers. This
@@ -2000,12 +2002,12 @@
 <span class='nx-comment'># Proving an invalid values will raise an error
 </span>fido::tail length <span class='nx-string'>"Hello"</span></pre></td></tr></table></div></div>
 <div class="paragraph"><p><a href="#xmp-fido2">Listing 22</a> shows an extended example, where every dog
-has a tail. The object <tt>tail</tt> is created as a subobject of the dog in
-the constructor <tt>init</tt>. The subobject can be accessed by providing the
-full name of the subobject <tt>fido::tail</tt>. The method <tt>length</tt> is an
+has a tail. The object <code>tail</code> is created as a subobject of the dog in
+the constructor <code>init</code>. The subobject can be accessed by providing the
+full name of the subobject <code>fido::tail</code>. The method <code>length</code> is an
 C-implemented accessor, that enforces the value constraint (here a
 floating point number, since length uses the value constraint
-<tt>double</tt>).</p></div>
+<code>double</code>).</p></div>
 <div class="paragraph" id="xmp-fido3"><div class="title">Listing 23: Forwarder Methods</div><p></p></div>
 <div class="listingblock">
 <div class="content"><style type='text/css'>
@@ -2041,7 +2043,7 @@
   <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> bark {} { <span class='nx-keyword'>puts</span> <span class='nx-string'>"[self] Bark, bark, bark."</span> }
   <span class='nx-keyword'>:method</span> <span class='nx-keyword'>init</span> {} {
     Tail <span class='nx-keyword'>create</span> [<span class='nx-keyword'>self</span>]::tail
-    <span class='nx-keyword'>:public</span> <span class='nx-keyword'>forward</span> wag [<span class='nx-keyword'>self</span>]::tail wag
+    <span class='nx-keyword'>:public</span> <span class='nx-keyword'>object</span> <span class='nx-keyword'>forward</span> wag [<span class='nx-keyword'>self</span>]::tail wag
   }
 }
 
@@ -2057,9 +2059,9 @@
 </span><span class='nx-comment'># Therefore, the following method returns "Joy".
 </span>fido wag</pre></td></tr></table></div></div>
 <div class="paragraph"><p><a href="#xmp-fido3">Listing 23</a> again extends the example by adding a
-forwarder named <tt>wag</tt> to the object (e.g. <tt>fido</tt>). The forwarder
-redirects all calls of the form <tt>fido wag</tt> with arbitrary arguments to
-the subobject <tt>fido::tail</tt>.</p></div>
+forwarder named <code>wag</code> to the object (e.g. <code>fido</code>). The forwarder
+redirects all calls of the form <code>fido wag</code> with arbitrary arguments to
+the subobject <code>fido::tail</code>.</p></div>
 <div class="exampleblock">
 <div class="content">
 <div class="paragraph"><p>A <strong>forwarder method</strong> is a
@@ -2070,9 +2072,9 @@
 </div></div>
 <div class="paragraph"><p>The functionality of the forwarder can just as well be implemented as
 a scripted method, but for the most common cases, the forward
-implementation is more efficient, and the <tt>forward</tt> method expresses
+implementation is more efficient, and the <code>forward</code> method expresses
 the intention of the developer.</p></div>
-<div class="paragraph"><p>The method <tt>forwarder</tt> has several options to change e.g. the order of
+<div class="paragraph"><p>The method <code>forwarder</code> has several options to change e.g. the order of
 the arguments, or to substitute certain patterns in the argument list
 etc. This will be described in later sections.</p></div>
 </div>
@@ -2142,15 +2144,15 @@
 The call-protection defines from which calling context methods might
 be called. The Next Scripting Framework supports as well redefinition
 protection for methods.</p></div>
-<div class="paragraph"><p>NX distinguishes between <tt>public</tt>, <tt>protected</tt> and <tt>private</tt> methods,
-where the default call-protection is <tt>protected</tt>.</p></div>
+<div class="paragraph"><p>NX distinguishes between <code>public</code>, <code>protected</code> and <code>private</code> methods,
+where the default call-protection is <code>protected</code>.</p></div>
 <div class="exampleblock">
 <div class="content">
 <div class="paragraph"><p>A <strong>public</strong> method can be called from every context. A <strong>protected</strong>
 method can only be invoked from the same object. A <strong>private</strong> method
 can only be invoked from methods defined on the same entity
 (defined on the same class or on the same object) via the invocation
-with the local flag (i.e. "<tt>: -local foo</tt>").</p></div>
+with the local flag (i.e. "<code>: -local foo</code>").</p></div>
 </div></div>
 <div class="paragraph"><p>All kind of method protections are applicable for all kind of methods,
 either scripted or C-implemented.</p></div>
@@ -2218,10 +2220,10 @@
 
 <span class='nx-comment'># The invocation of the protected method "helper" raises an error:
 </span>f1 helper</pre></td></tr></table></div></div>
-<div class="paragraph"><p>The example above uses <tt>:protected method helper &#8230;</tt>. We could have
-used here as well <tt>:method helper &#8230;</tt>, since the default method
+<div class="paragraph"><p>The example above uses <code>:protected method helper &#8230;</code>. We could have
+used here as well <code>:method helper &#8230;</code>, since the default method
 call-protection is already protected.</p></div>
-<div class="paragraph"><p>The method call-protection of <tt>private</tt> goes one step further and
+<div class="paragraph"><p>The method call-protection of <code>private</code> goes one step further and
 helps to hide implementation details also for implementors of
 subclasses. Private methods are a means for avoiding unanticipated name
 clashes. Consider the following example:</p></div>
@@ -2265,31 +2267,31 @@
 s1 foo 3 4     ;<span class='nx-comment'># returns 7
 </span>s1 bar 3 4     ;<span class='nx-comment'># returns 12
 </span>s1 helper 3 4  ;<span class='nx-comment'># raises error: unable to dispatch method helper</span></pre></td></tr></table></div></div>
-<div class="paragraph"><p>The base class implements a public method <tt>foo</tt> using the helper
-method named <tt>helper</tt>. The derived class implements a as well a public
-method <tt>bar</tt>, which is also using a helper method named <tt>helper</tt>. When
-an instance <tt>s1</tt> is created from the derived class, the method <tt>foo</tt>
+<div class="paragraph"><p>The base class implements a public method <code>foo</code> using the helper
+method named <code>helper</code>. The derived class implements a as well a public
+method <code>bar</code>, which is also using a helper method named <code>helper</code>. When
+an instance <code>s1</code> is created from the derived class, the method <code>foo</code>
 is invoked which uses in turn the private method of the base
-class. Therefore, the invocation <tt>s1 foo 3 4</tt> returns its sum. If
-the <tt>local</tt> flag had not beed used in helper, <tt>s1</tt> would
-have tried to call the helper of <tt>Sub</tt>, which would be incorrect. For
+class. Therefore, the invocation <code>s1 foo 3 4</code> returns its sum. If
+the <code>local</code> flag had not beed used in helper, <code>s1</code> would
+have tried to call the helper of <code>Sub</code>, which would be incorrect. For
 all other purposes, the private methods are "invisible" in all
-situations, e.g., when mixins are used, or within the <tt>next</tt>-path, etc.</p></div>
-<div class="paragraph"><p>By using the <tt>-local</tt> flag at the call site it is possible to invoce
+situations, e.g., when mixins are used, or within the <code>next</code>-path, etc.</p></div>
+<div class="paragraph"><p>By using the <code>-local</code> flag at the call site it is possible to invoce
 only the local definition of the method. If we would call the method
 without this flag, the resolution order would be the standard
-resolution order, starting with filters, mixins, per-object methods
+resolution order, starting with filters, mixins, object methods
 and the full intrinsic class hierarchy.</p></div>
-<div class="paragraph"><p>NX supports the modifier <tt>private</tt> for methods and properties. In all
-cases <tt>private</tt> is an instrument to avoid unanticipated interactions
+<div class="paragraph"><p>NX supports the modifier <code>private</code> for methods and properties. In all
+cases <code>private</code> is an instrument to avoid unanticipated interactions
 and means actually "accessible for methods defined on the same entity
-(object or class)". The main usage for <tt>private</tt> is to improve
+(object or class)". The main usage for <code>private</code> is to improve
 locality of the code e.g. for compositional operations.</p></div>
 <div class="paragraph"><p>In order to improve locality for properties, a private property
 defines therfore internally a variable with a different name to avoid
 unintended interactions. The variable should be accessed via the
-private accessor, which can be invoved with the <tt>-local</tt> flag.  In the
-following example class <tt>D</tt> introduces a private property with the
+private accessor, which can be invoved with the <code>-local</code> flag.  In the
+following example class <code>D</code> introduces a private property with the
 same name as a property in the superclass.</p></div>
 <div class="paragraph" id="xmp-private-properties"><div class="title">Listing 27: Private Properties</div><p></p></div>
 <div class="listingblock">
@@ -2353,10 +2355,10 @@
 </span>D <span class='nx-keyword'>create</span> d1
 <span class='nx-keyword'>puts</span> [d1 x]       ;<span class='nx-comment'># prints "c"
 </span><span class='nx-keyword'>puts</span> [d1 bar x]   ;<span class='nx-comment'># prints "d"</span></pre></td></tr></table></div></div>
-<div class="paragraph"><p>Without the <tt>private</tt> definition of the property, the definition of
-property <tt>x</tt> in class <tt>D</tt> would shadow the
-definition of the property in the superclass <tt>C</tt> for its instances
-(<tt>d1 x</tt> or <tt>set :x</tt> would return <tt>d</tt> instead of <tt>c</tt>).</p></div>
+<div class="paragraph"><p>Without the <code>private</code> definition of the property, the definition of
+property <code>x</code> in class <code>D</code> would shadow the
+definition of the property in the superclass <code>C</code> for its instances
+(<code>d1 x</code> or <code>set :x</code> would return <code>d</code> instead of <code>c</code>).</p></div>
 </div>
 <div class="sect2">
 <h3 id="_applicability_of_methods">3.4. Applicability of Methods</h3>
@@ -2371,8 +2373,8 @@
 class are applicable to the instances (direct or indirect) of this
 class. These methods are called <strong>instance methods</strong>.</p></div>
 </div></div>
-<div class="paragraph"><p>In the following example method, <tt>foo</tt> is an instance method defined
-on class <tt>C</tt>.</p></div>
+<div class="paragraph"><p>In the following example method, <code>foo</code> is an instance method defined
+on class <code>C</code>.</p></div>
 <div class="paragraph" id="xmp-instance-applicable"><div class="title">Listing 28: Methods applicable for instances</div><p></p></div>
 <div class="listingblock">
 <div class="content"><style type='text/css'>
@@ -2408,17 +2410,17 @@
 <h4 id="_object_methods">3.4.2. Object Methods</h4>
 <div class="exampleblock">
 <div class="content">
-<div class="paragraph"><p>Methods defined on objects are <strong>per-object methods</strong>. Per-object
+<div class="paragraph"><p>Methods defined on objects are <strong>object methods</strong>. Object
 methods are only applicable on the object, on which they are defined.
-Per-object methods cannot be inherited from other objects.</p></div>
+Object methods cannot be inherited from other objects.</p></div>
 </div></div>
-<div class="paragraph"><p>The following example defines an object specific method <tt>bar</tt> on the
-instance <tt>c1</tt> of class <tt>C</tt>, and as well as the object specific method
-<tt>baz</tt> defined on the object <tt>o1</tt>. An object-specific method is defined
-simply by defining the method on an object.</p></div>
-<div class="paragraph"><p>Note that we can define a per-object method that shadows (redefines)
-for this object an intrinsic instance method.</p></div>
-<div class="paragraph" id="xmp-object-applicable1"><div class="title">Listing 29: Per-object Method</div><p></p></div>
+<div class="paragraph"><p>The following example defines an object method <code>bar</code> on the
+instance <code>c1</code> of class <code>C</code>, and as well as the object specific method
+<code>baz</code> defined on the object <code>o1</code>. An object method is defined
+via <code>object method</code>.</p></div>
+<div class="paragraph"><p>Note that we can define a object method that shadows (redefines)
+for this object methods provided from classes.</p></div>
+<div class="paragraph" id="xmp-object-applicable1"><div class="title">Listing 29: Object Method</div><p></p></div>
 <div class="listingblock">
 <div class="content"><style type='text/css'>
 .nx             {color: #000000; font-weight: normal; font-style: normal; padding-left: 10px}
@@ -2452,8 +2454,8 @@
 </pre></td><td class='nx-body'><pre class='nx'><span class='nx-keyword'>nx::Class</span> <span class='nx-keyword'>create</span> C {
   <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> foo {} {<span class='nx-keyword'>return</span> 1}
   <span class='nx-keyword'>:create</span> c1 {
-     <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> foo {} {<span class='nx-keyword'>return</span> 2}
-     <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> bar {} {<span class='nx-keyword'>return</span> 3}
+     <span class='nx-keyword'>:public</span> <span class='nx-keyword'>object</span> <span class='nx-keyword'>method</span> foo {} {<span class='nx-keyword'>return</span> 2}
+     <span class='nx-keyword'>:public</span> <span class='nx-keyword'>object</span> <span class='nx-keyword'>method</span> bar {} {<span class='nx-keyword'>return</span> 3}
   }
 }
 
@@ -2465,7 +2467,7 @@
 
 <span class='nx-comment'># Method "baz" is an object specific method of "o1"
 </span><span class='nx-keyword'>nx::Object</span> <span class='nx-keyword'>create</span> o1 {
-  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> baz {} {<span class='nx-keyword'>return</span> 4}
+  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>object</span> <span class='nx-keyword'>method</span> baz {} {<span class='nx-keyword'>return</span> 4}
 }
 o1 baz</pre></td></tr></table></div></div>
 </div>
@@ -2474,17 +2476,17 @@
 <div class="exampleblock">
 <div class="content">
 <div class="paragraph"><p>A <strong>class method</strong> is a method defined on a class, which is only
-applicable to the class object itself. The class method is a
-per-object method of the class object.</p></div>
+applicable to the class object itself. The class method is actually
+an object method of the class object.</p></div>
 </div></div>
 <div class="paragraph"><p>In NX, all classes are objects. Classes are in NX special kind of
 objects that have e.g. the ability to create instances and to provide
 methods for the instances. Classes manage their instances. The general
 method set for classes is defined on the meta-classes (more about
 this later).</p></div>
-<div class="paragraph"><p>The following example defines a public class method <tt>bar</tt> on class
-<tt>C</tt>. The class method is specified by using the modifier <tt>class</tt> in
-front of <tt>method</tt> in the method definition command.</p></div>
+<div class="paragraph"><p>The following example defines a public class method <code>bar</code> on class
+<code>C</code>. The class method is specified by using the modifier <code>object</code> in
+front of <code>method</code> in the method definition command.</p></div>
 <div class="paragraph" id="xmp-object-applicable2"><div class="title">Listing 30: Class Methods</div><p></p></div>
 <div class="listingblock">
 <div class="content"><style type='text/css'>
@@ -2527,7 +2529,7 @@
 </span>  <span class='nx-comment'># Define a class method "bar" and an instance
 </span>  <span class='nx-comment'># method "foo"
 </span>  <span class='nx-comment'>#
-</span>  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>class</span> <span class='nx-keyword'>method</span> bar {} {<span class='nx-keyword'>return</span> 2}
+</span>  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>object</span> <span class='nx-keyword'>method</span> bar {} {<span class='nx-keyword'>return</span> 2}
   <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> foo {} {<span class='nx-keyword'>return</span> 1}
 
   <span class='nx-comment'>#
@@ -2567,7 +2569,7 @@
 and they are extensible in various ways. It is possible to add
 sub-methods at any time to existing ensembles. Furthermore, it is
 possible to extend ensemble methods via mixin classes.</p></div>
-<div class="paragraph"><p>The following example defines an ensemble method for <tt>string</tt>. An
+<div class="paragraph"><p>The following example defines an ensemble method for <code>string</code>. An
 ensemble method is defined when the provide method name contains a
 space.</p></div>
 <div class="paragraph" id="xmp-ensemble-methods"><div class="title">Listing 31: Ensemble Method</div><p></p></div>
@@ -2617,7 +2619,7 @@
 following order:</p></div>
 Per-object Mixins -> Per-class Mixins -> Object -> Intrinsic Class Hierarchy
 <div class="paragraph"><p>In the case, no mixins are involved, first the object is searched for
-a per-object method with the given name, and then the class hierarchy
+an object method with the given name, and then the class hierarchy
 of the object. The method can be defined multiple times on the search
 path, so some of these method definitions might be <em>shadowed</em> by the
 more specific definitions.</p></div>
@@ -2662,7 +2664,7 @@
   <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> foo {} { <span class='nx-keyword'>return</span> <span class='nx-string'>"D foo: [next]"</span>}
 
    <span class='nx-keyword'>:create</span> d1 {
-     <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> foo {} { <span class='nx-keyword'>return</span> <span class='nx-string'>"d1 foo: [next]"</span>}
+     <span class='nx-keyword'>:public</span> <span class='nx-keyword'>object</span> <span class='nx-keyword'>method</span> foo {} { <span class='nx-keyword'>return</span> <span class='nx-string'>"d1 foo: [next]"</span>}
    }
 }
 
@@ -2674,18 +2676,18 @@
 </span>d1 <span class='nx-keyword'>info</span> precedence
 <span class='nx-comment'># result: "::D ::C ::nx::Object"</span></pre></td></tr></table></div></div>
 <div class="paragraph"><p>Consider the example in
-<tt>foo</tt> is invoked on object <tt>d1</tt>, the per-object method has the highest
-precedence and is therefore invoked. The per-object methods shadows
-the same-named methods in the class hierarchy, namely the method <tt>foo</tt>
-of class <tt>D</tt> and the method <tt>foo</tt> of class <tt>C</tt>. The shadowed methods
-can be still invoked, either via the primitive <tt>next</tt> or via method
+<code>foo</code> is invoked on object <code>d1</code>, the object method has the highest
+precedence and is therefore invoked. The object methods shadows
+the same-named methods in the class hierarchy, namely the method <code>foo</code>
+of class <code>D</code> and the method <code>foo</code> of class <code>C</code>. The shadowed methods
+can be still invoked, either via the primitive <code>next</code> or via method
 handles (we used already method handles in the section about method
-aliases). In the example above, <tt>next</tt> calls the shadowed method and
+aliases). In the example above, <code>next</code> calls the shadowed method and
 add their results to the results of every method. So, the final result
-contains parts from <tt>d1</tt>, <tt>D</tt> and <tt>C</tt>. Note, that the topmost <tt>next</tt>
-in method <tt>foo</tt> of class <tt>C</tt> shadows no method <tt>foo</tt> and simply
+contains parts from <code>d1</code>, <code>D</code> and <code>C</code>. Note, that the topmost <code>next</code>
+in method <code>foo</code> of class <code>C</code> shadows no method <code>foo</code> and simply
 returns empty (and not an error message).</p></div>
-<div class="paragraph"><p>The introspection method <tt>info precedence</tt> provides information about
+<div class="paragraph"><p>The introspection method <code>info precedence</code> provides information about
 the order, in which classes processed during method resolution.</p></div>
 <div class="paragraph" id="xmp-method-resolution2"><div class="title">Listing 33: Method Resolution with Mixin Classes</div><p></p></div>
 <div class="listingblock">
@@ -2734,7 +2736,7 @@
 </span><span class='nx-comment'># "d1" is created based on the definitions of the last example
 </span><span class='nx-comment'>#
 </span><span class='nx-comment'># Add the methods from "M1" as per-object mixin to "d1"
-</span>d1 <span class='nx-keyword'>mixin</span> M1
+</span>d1 <span class='nx-keyword'>object</span> <span class='nx-keyword'>mixin</span> M1
 
 <span class='nx-comment'>#
 </span><span class='nx-comment'># Add the methods from "M2" as per-class mixin to class "C"
@@ -2748,10 +2750,10 @@
 </span>d1 <span class='nx-keyword'>info</span> precedence
 <span class='nx-comment'># result: "::M1 ::M2 ::D ::C ::nx::Object"</span></pre></td></tr></table></div></div>
 <div class="paragraph"><p>an extension of the previous example. We define here two additional
-classes <tt>M1</tt> and <tt>M2</tt> which are used as per-object and per-class
-mixins.  Both classes define the method <tt>foo</tt>, these methods shadow
+classes <code>M1</code> and <code>M2</code> which are used as per-object and per-class
+mixins.  Both classes define the method <code>foo</code>, these methods shadow
 the definitions of the intrinsic class hierarchy. Therefore an
-invocation of <tt>foo</tt> on object <tt>d1</tt> causes first an invocation of
+invocation of <code>foo</code> on object <code>d1</code> causes first an invocation of
 method in the per-object mixin.</p></div>
 <div class="paragraph" id="xmp-method-resolution3"><div class="title">Listing 34: Method Invocation Flags</div><p></p></div>
 <div class="listingblock">
@@ -2785,10 +2787,10 @@
 </span><span class='nx-comment'># "d1" is created based on the definitions of the last two examples,
 </span><span class='nx-comment'># the mixins "M1" and "M2" are registered.
 </span><span class='nx-comment'>#
-</span><span class='nx-comment'># Define a public per-object method "bar", which calls the method
+</span><span class='nx-comment'># Define a public object method "bar", which calls the method
 </span><span class='nx-comment'># "foo" which various invocation options:
 </span><span class='nx-comment'>#
-</span>d1 <span class='nx-keyword'>public</span> <span class='nx-keyword'>method</span> bar {} {
+</span>d1 <span class='nx-keyword'>public</span> <span class='nx-keyword'>object</span> <span class='nx-keyword'>method</span> bar {} {
    <span class='nx-keyword'>puts</span> [:foo]
    <span class='nx-keyword'>puts</span> [: -local foo]
    <span class='nx-keyword'>puts</span> [: -intrinsic foo]
@@ -2797,36 +2799,36 @@
 
 <span class='nx-comment'># Invoke the method "bar"
 </span>d1 bar</pre></td></tr></table></div></div>
-<div class="paragraph"><p>In the first line of the body of method <tt>bar</tt>, the method <tt>foo</tt> is
+<div class="paragraph"><p>In the first line of the body of method <code>bar</code>, the method <code>foo</code> is
 called as usual with an implicit receiver, which defaults to the
-current object (therefore, the call is equivalent to <tt>d1 foo</tt>). The
+current object (therefore, the call is equivalent to <code>d1 foo</code>). The
 next three calls show how to provide flags that influence the method
 resolution. The flags can be provided between the colon and the method
 name. These flags are used rather seldomly but can be helpful in some
 situations.</p></div>
-<div class="paragraph"><p>The invocation flag <tt>-local</tt> means that the method has to be resolved
+<div class="paragraph"><p>The invocation flag <code>-local</code> means that the method has to be resolved
 from the same place, where the current method is defined. Since the
-current method is defined as a per-object method, <tt>foo</tt> is resolved as
-a per-object method. The effect is that the mixin definitions are
-ignored. The invocation flag <tt>-local</tt> was already introduced int the
+current method is defined as a object method, <code>foo</code> is resolved as
+a object method. The effect is that the mixin definitions are
+ignored. The invocation flag <code>-local</code> was already introduced int the
 section about method protection, where it was used to call <em>private</em>
 methods.</p></div>
-<div class="paragraph"><p>The invocation flag <tt>-intrinsic</tt> means that the method has to be resolved
+<div class="paragraph"><p>The invocation flag <code>-intrinsic</code> means that the method has to be resolved
 from the intrinsic definitions, meaning simply without mixins. The
-effect is here the same as with the invocation flag <tt>-local</tt>.</p></div>
-<div class="paragraph"><p>The invocation flag <tt>-system</tt> means that the method has to be resolved
+effect is here the same as with the invocation flag <code>-local</code>.</p></div>
+<div class="paragraph"><p>The invocation flag <code>-system</code> means that the method has to be resolved
 from basic - typically predefined - classes of the object system. This
 can be useful, when script overloads system methods, but still want to
 call the shadowed methods from the base classes. In our case, we have
-no definitions of <tt>foo</tt> on the base clases, therefore an error message
+no definitions of <code>foo</code> on the base clases, therefore an error message
 is returned.</p></div>
 <div class="paragraph"><p></p></div>
 <div class="listingblock">
 <div class="content">
-<pre><tt>   M1 foo: M2 foo: d1 foo: D foo: C foo:
+<pre><code>   M1 foo: M2 foo: d1 foo: D foo: C foo:
    d1 foo: D foo: C foo:
    d1 foo: D foo: C foo:
-   ::d1: unable to dispatch method 'foo'</tt></pre>
+   ::d1: unable to dispatch method 'foo'</code></pre>
 </div></div>
 </div>
 <div class="sect2">
@@ -2962,31 +2964,31 @@
 o1 baz 200
 o1 baz -- -y</pre></td></tr></table></div></div>
 <div class="paragraph"><p>Consider the example in <a href="#xmp-posnonpos">Listing 35</a>. The method
-<tt>foo</tt> has the argument list <tt>x y</tt>. This means that the first argument
-is passed in an invocation like <tt>o1 foo 1 2</tt> to <tt>x</tt> (here, the value
-<tt>1</tt>), and the second argument is passed to <tt>y</tt> (here the value <tt>2</tt>).
-Method <tt>bar</tt> has in contrary just with non-positional arguments. Here
+<code>foo</code> has the argument list <code>x y</code>. This means that the first argument
+is passed in an invocation like <code>o1 foo 1 2</code> to <code>x</code> (here, the value
+<code>1</code>), and the second argument is passed to <code>y</code> (here the value <code>2</code>).
+Method <code>bar</code> has in contrary just with non-positional arguments. Here
 we pass the names of the parameter together with the values. In the
-invocation <tt>o1 bar -y 3 -x 1</tt> the names of the parameters are prefixed
+invocation <code>o1 bar -y 3 -x 1</code> the names of the parameters are prefixed
 with a dash ("-"). No matter whether in which order we write the
 non-positional parameters in the invocation (see line 30 and 31 in
-<a href="#xmp-posnonpos">Listing 35</a>) in both cases the variables <tt>x</tt>
-and <tt>y</tt> in the body of the method <tt>bar</tt> get the same values assigned
-(<tt>x</tt> becomes <tt>1</tt>, <tt>y</tt> becomes <tt>3</tt>).</p></div>
+<a href="#xmp-posnonpos">Listing 35</a>) in both cases the variables <code>x</code>
+and <code>y</code> in the body of the method <code>bar</code> get the same values assigned
+(<code>x</code> becomes <code>1</code>, <code>y</code> becomes <code>3</code>).</p></div>
 <div class="paragraph"><p>It is certainly possible to combine positional and non-positional
-arguments. Method <tt>baz</tt> provides two non-positional parameter (<tt>-y</tt>
-and <tt>-y</tt>) and one positional parameter (namely <tt>a</tt>). The invocation in
-line 34 passes the value of <tt>1</tt> to <tt>x</tt> and the value of <tt>100</tt> to <tt>a</tt>.
-There is no value passed to <tt>y</tt>, therefore value of <tt>y</tt> will be
-undefined in the body of <tt>baz</tt>, <tt>info exists y</tt> checks for the
-existence of the variable <tt>y</tt> and returns <tt>0</tt>.</p></div>
+arguments. Method <code>baz</code> provides two non-positional parameter (<code>-y</code>
+and <code>-y</code>) and one positional parameter (namely <code>a</code>). The invocation in
+line 34 passes the value of <code>1</code> to <code>x</code> and the value of <code>100</code> to <code>a</code>.
+There is no value passed to <code>y</code>, therefore value of <code>y</code> will be
+undefined in the body of <code>baz</code>, <code>info exists y</code> checks for the
+existence of the variable <code>y</code> and returns <code>0</code>.</p></div>
 <div class="paragraph"><p>The invocation in line 35 passes only a value to the positional
 parameter. A more tricky case is in line 36, where we want to pass
-<tt>-y</tt> as a value to the positional parameter <tt>a</tt>. The case is more
-tricky since syntactically the argument parser might consider <tt>-y</tt> as
-the name of one of the non-positional parameter. Therefore we use <tt>--</tt>
+<code>-y</code> as a value to the positional parameter <code>a</code>. The case is more
+tricky since syntactically the argument parser might consider <code>-y</code> as
+the name of one of the non-positional parameter. Therefore we use <code>--</code>
 (double dash) to indicate the end of the block of the non-positional
-parameters and therefore the value of <tt>-y</tt> is passed to <tt>a</tt>.</p></div>
+parameters and therefore the value of <code>-y</code> is passed to <code>a</code>.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_optional_and_required_parameters">3.7.2. Optional and Required Parameters</h4>
@@ -3048,25 +3050,25 @@
 
 <span class='nx-comment'># invoke foo (one optional positional parameter is missing)
 </span>o2 foo 1</pre></td></tr></table></div></div>
-<div class="paragraph"><p>The example in <a href="#xmp-optional-req">Listing 36</a> defined method <tt>foo</tt>
+<div class="paragraph"><p>The example in <a href="#xmp-optional-req">Listing 36</a> defined method <code>foo</code>
 with one required and one optional positional parameter. For this
-purpose we use the parameter options <tt>required</tt> and <tt>optional</tt>. The
+purpose we use the parameter options <code>required</code> and <code>optional</code>. The
 parameter options are separated from the parameter name by a colon. If
 there are multiple parameter options, these are separated by commas
 (we show this in later examples).</p></div>
-<div class="paragraph"><p>The parameter definition <tt>x:required</tt> for method <tt>foo</tt> is equivalent
-to <tt>x</tt> without any parameter options (see e.g. previous example),
+<div class="paragraph"><p>The parameter definition <code>x:required</code> for method <code>foo</code> is equivalent
+to <code>x</code> without any parameter options (see e.g. previous example),
 since positional parameters are per default required. The invocation
 in line 21 of <a href="#xmp-optional-req">Listing 36</a> will lead to an
-undefined variable <tt>y</tt> in method <tt>foo</tt>, because no value us passed to
+undefined variable <code>y</code> in method <code>foo</code>, because no value us passed to
 the optional parameter. Note that only trailing positional parameters might be
-optional. If we would call method <tt>foo</tt> of <a href="#xmp-posnonpos">Listing 35</a> with only one argument, the system would raise an
+optional. If we would call method <code>foo</code> of <a href="#xmp-posnonpos">Listing 35</a> with only one argument, the system would raise an
 exception.</p></div>
-<div class="paragraph"><p>Similarly, we define method <tt>bar</tt> in <a href="#xmp-optional-req">Listing 36</a> with one required and one optional non-positional
-parameter. The parameter definition <tt>-y:optional</tt> is equivalent to
-<tt>-y</tt>, since non-positional parameter are per default optional.
-However, the non-positional parameter <tt>-x:required</tt> is required. If we
-invoke <tt>bar</tt> without it, the system will raise an exception.</p></div>
+<div class="paragraph"><p>Similarly, we define method <code>bar</code> in <a href="#xmp-optional-req">Listing 36</a> with one required and one optional non-positional
+parameter. The parameter definition <code>-y:optional</code> is equivalent to
+<code>-y</code>, since non-positional parameter are per default optional.
+However, the non-positional parameter <code>-x:required</code> is required. If we
+invoke <code>bar</code> without it, the system will raise an exception.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_default_values_for_parameters">3.7.3. Default Values for Parameters</h4>
@@ -3145,7 +3147,7 @@
 extended on the scripting level. The built-in checkers are either the
 native checkers provided directly by the Next Scripting Framework (the
 most efficient checkers) or the value checkers provided by Tcl through
-<tt>string is &#8230;</tt>. The built-in checkers have as well the advantage that
+<code>string is &#8230;</code>. The built-in checkers have as well the advantage that
 they can be used also at any time during bootstrap of an object
 system, at a time, when e.g. no objects or methods are defined. The
 same checkers are used as well for all C-implemented primitives of NX
@@ -3199,7 +3201,7 @@
   <span class='nx-comment'>#
 </span>  <span class='nx-comment'># Positional parameter with value constraints:
 </span>  <span class='nx-comment'>#
-</span>  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> foo {x:integer o:object,optional} {
+</span>  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> foo {x:integer o<span class='nx-keyword'>:object</span>,optional} {
     <span class='nx-keyword'>puts</span> <span class='nx-string'>"x=$x o? [info exists o]"</span>
   }
 
@@ -3214,14 +3216,14 @@
 <span class='nx-comment'># The following invocation raises an exception
 </span>o4 foo a</pre></td></tr></table></div></div>
 <div class="paragraph"><p>Value contraints are specified as parameter options in the parameter
-specifications. The parameter specification <tt>x:integer</tt> defines <tt>x</tt> as
+specifications. The parameter specification <code>x:integer</code> defines <code>x</code> as
 a required positional parmeter which value is constraint to an
-integer. The parameter specification <tt>o:object,optional</tt> shows how to
-combine multiple parameter options. The parameter <tt>o</tt> is an optional
+integer. The parameter specification <code>o:object,optional</code> shows how to
+combine multiple parameter options. The parameter <code>o</code> is an optional
 positional parameter, its value must be an object (see
 <a href="#xmp-value-check">Listing 39</a>). Value constraints are
 specified exactly the same way for non-positional parameters (see
-method <tt>bar</tt> in <a href="#xmp-value-check">Listing 39</a>).</p></div>
+method <code>bar</code> in <a href="#xmp-value-check">Listing 39</a>).</p></div>
 <div class="paragraph" id="xmp-check-parameterized"><div class="title">Listing 40: Parameterized Value Constraints</div><p></p></div>
 <div class="listingblock">
 <div class="content"><style type='text/css'>
@@ -3273,8 +3275,8 @@
 </span>  <span class='nx-comment'># Parameterized value constraints
 </span>  <span class='nx-comment'>#
 </span>  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> work {
-     -person:object,type=Person
-     -project:object,type=Project
+     -person<span class='nx-keyword'>:object</span>,type=Person
+     -project<span class='nx-keyword'>:object</span>,type=Project
    } {
     <span class='nx-comment'># ...
 </span>  }
@@ -3290,27 +3292,27 @@
 </span><span class='nx-comment'># Use method with value constraints
 </span><span class='nx-comment'>#
 </span>o5 work -person gustaf -project nx</pre></td></tr></table></div></div>
-<div class="paragraph"><p>The native checkers <tt>object</tt>, <tt>class</tt>, <tt>metaclass</tt> and <tt>baseclass</tt> can
-be further specialized with the parameter option <tt>type</tt> to restrict
+<div class="paragraph"><p>The native checkers <code>object</code>, <code>class</code>, <code>metaclass</code> and <code>baseclass</code> can
+be further specialized with the parameter option <code>type</code> to restrict
 the permissible values to instances of certain classes. We can use for
-example the native value constraint <tt>object</tt> either for testing
+example the native value constraint <code>object</code> either for testing
 whether an argument is some object (without further constraints, as in
-<a href="#xmp-default-value">Listing 37</a>, method <tt>foo</tt>), or we can
+<a href="#xmp-default-value">Listing 37</a>, method <code>foo</code>), or we can
 constrain the value further to some type (direct or indirect instance
-of a class). This is shown by method <tt>work</tt> in
+of a class). This is shown by method <code>work</code> in
 <a href="#xmp-check-parameterized">Listing 40</a> which requires
-the parameter <tt>-person</tt> to be an instance of class <tt>Person</tt> and the
-parameter <tt>-project</tt> to be an instance of class <tt>Project</tt>.</p></div>
+the parameter <code>-person</code> to be an instance of class <code>Person</code> and the
+parameter <code>-project</code> to be an instance of class <code>Project</code>.</p></div>
 </div>
 <div class="sect4">
 <h5 id="_scripted_value_constraints">Scripted Value Constraints</h5>
 <div class="paragraph"><p>The set of predefined value checkers can be extended by application
 programs via defining methods following certain conventions. The user
-defined value checkers are defined as methods of the class <tt>nx::Slot</tt>
+defined value checkers are defined as methods of the class <code>nx::Slot</code>
 or of one of its subclasses or instances. We will address such cases
 in the next sections. In the following example we define two new
-value checkers on class <tt>nx::Slot</tt>. The first value checker is called
-<tt>groupsize</tt>, the second one is called <tt>choice</tt>.</p></div>
+value checkers on class <code>nx::Slot</code>. The first value checker is called
+<code>groupsize</code>, the second one is called <code>choice</code>.</p></div>
 <div class="paragraph" id="xmp-user-types"><div class="title">Listing 41: Scripted Value Checker for Method Parameters</div><p></p></div>
 <div class="listingblock">
 <div class="content"><style type='text/css'>
@@ -3403,25 +3405,25 @@
 <span class='nx-comment'># testing "choice"
 </span>d1 bar green good
 d1 bar pink bad</pre></td></tr></table></div></div>
-<div class="paragraph"><p>In order to define a checker <tt>groupsize</tt> a method of the name
-<tt>type=groupsize</tt> is defined. This method receives two arguments,
-<tt>name</tt> and <tt>value</tt>. The first argument is the name of the parameter
+<div class="paragraph"><p>In order to define a checker <code>groupsize</code> a method of the name
+<code>type=groupsize</code> is defined. This method receives two arguments,
+<code>name</code> and <code>value</code>. The first argument is the name of the parameter
 (mostly used for the error message) and the second parameter is
 provided value. The value checker simply tests whether the provided
 value is between 1 and 3 and raises an exception if this is not the
 case (invocation in line 36 in <a href="#xmp-user-types">Listing 41</a>).</p></div>
-<div class="paragraph"><p>The checker <tt>groupsize</tt> has the permissible values defined in its
+<div class="paragraph"><p>The checker <code>groupsize</code> has the permissible values defined in its
 method&#8217;s body. It is as well possible to define more generic checkers
 that can be parameterized. For this parameterization, one can pass an
-argument to the checker method (last argument). The checker <tt>choice</tt>
+argument to the checker method (last argument). The checker <code>choice</code>
 can be used for restricting the values to a set of predefined
 constants. This set is defined in the parameter specification. The
-parameter <tt>a</tt> of method <tt>bar</tt> in <a href="#xmp-user-types">Listing 41</a>
-is restricted to the values <tt>red</tt>, <tt>yellow</tt> or <tt>green</tt>, and the
-parameter <tt>b</tt> is restricted to <tt>good</tt> or <tt>bad</tt>. Note that the syntax
+parameter <code>a</code> of method <code>bar</code> in <a href="#xmp-user-types">Listing 41</a>
+is restricted to the values <code>red</code>, <code>yellow</code> or <code>green</code>, and the
+parameter <code>b</code> is restricted to <code>good</code> or <code>bad</code>. Note that the syntax
 of the permissible values is solely defined by the definition of the
 value checker in lines 13 to 17. The invocation in line 39 will be ok,
-the invocation in line 40 will raise an exception, since <tt>pink</tt> is not
+the invocation in line 40 will raise an exception, since <code>pink</code> is not
 allowed.</p></div>
 <div class="paragraph"><p>If the same checks are used in many places in the program,
 defining names for the value checker will be the better choice since
@@ -3437,15 +3439,15 @@
 single or multiple values.</p></div>
 </div></div>
 <div class="paragraph"><p>A multiplicity specification has a lower and an upper bound. A lower
-bound of <tt>0</tt> means that the value might be empty. A lower bound of <tt>1</tt>
+bound of <code>0</code> means that the value might be empty. A lower bound of <code>1</code>
 means that the parameter needs at least one value. The upper bound
-might be <tt>1</tt> or <tt>n</tt> (or synonymously <tt>*</tt>). While the upper bound of
-<tt>1</tt> states that at most one value has to be passed, the upper bound of
-<tt>n</tt> says that multiple values are permitted. Other kinds of
+might be <code>1</code> or <code>n</code> (or synonymously <code>*</code>). While the upper bound of
+<code>1</code> states that at most one value has to be passed, the upper bound of
+<code>n</code> says that multiple values are permitted. Other kinds of
 multiplicity are currently not allowed.</p></div>
 <div class="paragraph"><p>The multiplicity is written as parameter option in the parameter
 specification in the form <em>lower-bound</em>..<em>upper-bound</em>. If no
-multiplicity is defined the default multiplicity is <tt>1..1</tt>, which
+multiplicity is defined the default multiplicity is <code>1..1</code>, which
 means: provide exactly one (atomic) value (this was the case in the
 previous examples).</p></div>
 <div class="paragraph" id="xmp-multiplicity"><div class="title">Listing 42: Method Parameters with Explicit Multiplicity</div><p></p></div>
@@ -3515,10 +3517,10 @@
 <div class="paragraph"><p><a href="#xmp-multiplicity">Listing 42</a> contains three examples for
 positional parameters with different multiplicities. Multiplicity is
 often combined with value constraints. A parameter specification of
-the form <tt>x:integer,0..n</tt> means that the parameter <tt>x</tt> receives a list
+the form <code>x:integer,0..n</code> means that the parameter <code>x</code> receives a list
 of integers, which might be empty. Note that the value constraints are
 applied to every single element of the list.</p></div>
-<div class="paragraph"><p>The parameter specification <tt>x:integer,0..1</tt> means that <tt>x</tt> might be
+<div class="paragraph"><p>The parameter specification <code>x:integer,0..1</code> means that <code>x</code> might be
 an integer or it might be empty. This is one style of specifying that
 no explicit value is passed for a certain parameter. Another style is
 to use required or optional parameters. NX does not enforce any
@@ -3588,7 +3590,7 @@
 parameters is computed dynamically from the class structures, object
 parameters are often used in combination with special setter methods,
 etc.).  Consider the following example, where we define the two
-application classes <tt>Person</tt> and <tt>Student</tt> with a few properties.</p></div>
+application classes <code>Person</code> and <code>Student</code> with a few properties.</p></div>
 <div class="paragraph" id="xmp-object-parameters"><div class="title">Listing 43: Object Parameters</div><p></p></div>
 <div class="listingblock">
 <div class="content"><style type='text/css'>
@@ -3655,11 +3657,11 @@
 
 <span class='nx-comment'># Access property value via accessor method
 </span><span class='nx-keyword'>puts</span> <span class='nx-string'>"The name of s1 is [s1 name]"</span></pre></td></tr></table></div></div>
-<div class="paragraph"><p>The class <tt>Person</tt> has two properties <tt>name</tt> and <tt>birthday</tt>, where the
-property <tt>name</tt> is required, the property <tt>birthday</tt> is not. The
-class <tt>Student</tt> is a subclass of <tt>Person</tt> with the additional required
-property <tt>matnr</tt> and an optional property <tt>oncampus</tt> with the
-default value <tt>true</tt> (see <a href="#xmp-object-parameters">Listing 43</a>). The class diagram below visualizes these
+<div class="paragraph"><p>The class <code>Person</code> has two properties <code>name</code> and <code>birthday</code>, where the
+property <code>name</code> is required, the property <code>birthday</code> is not. The
+class <code>Student</code> is a subclass of <code>Person</code> with the additional required
+property <code>matnr</code> and an optional property <code>oncampus</code> with the
+default value <code>true</code> (see <a href="#xmp-object-parameters">Listing 43</a>). The class diagram below visualizes these
 definitions.</p></div>
 <div class="imageblock" id="img-object-parameters" style="text-align:center;">
 <div class="content">
@@ -3668,26 +3670,26 @@
 <div class="title">Figure 44. System and Application Classes</div>
 </div>
 <div class="paragraph"><p></p></div>
-<div class="paragraph"><p>In NX, these definitions imply that instances of the class of <tt>Person</tt>
-have the properties <tt>name</tt> and <tt>birthday</tt> as <em>non-positional object
-parameters</em>.  Furthermore it implies that instances of <tt>Student</tt> will
-have the object parameters of <tt>Person</tt> augmented with the object
-parameters from <tt>Student</tt> (namely <tt>matnr</tt> and <tt>oncampus</tt>).  Based on
-these object parameters, we can create a <tt>Person</tt> named <tt>Bob</tt> and a
-<tt>Student</tt> named <tt>Susan</tt> with the matriculation number <tt>4711</tt> (see line
-23 and 24 in <a href="#xmp-object-parameters">Listing 43</a>). After the object <tt>s1</tt> is created it has the
-instance variables <tt>name</tt>, <tt>matnr</tt> and <tt>oncampus</tt> (the latter is
+<div class="paragraph"><p>In NX, these definitions imply that instances of the class of <code>Person</code>
+have the properties <code>name</code> and <code>birthday</code> as <em>non-positional object
+parameters</em>.  Furthermore it implies that instances of <code>Student</code> will
+have the object parameters of <code>Person</code> augmented with the object
+parameters from <code>Student</code> (namely <code>matnr</code> and <code>oncampus</code>).  Based on
+these object parameters, we can create a <code>Person</code> named <code>Bob</code> and a
+<code>Student</code> named <code>Susan</code> with the matriculation number <code>4711</code> (see line
+23 and 24 in <a href="#xmp-object-parameters">Listing 43</a>). After the object <code>s1</code> is created it has the
+instance variables <code>name</code>, <code>matnr</code> and <code>oncampus</code> (the latter is
 initialized with the default value).</p></div>
 <div class="sect3">
 <h4 id="_object_parameters_for_all_nx_objects">4.3.1. Object Parameters for all NX Objects</h4>
 <div class="paragraph"><p>The object parameters are not limited to the application defined
 properties, also NX provides some predefined definitions. Since
-<tt>Person</tt> is a subclass of <tt>nx::Object</tt> also the object parameters of
-<tt>nx::Object</tt> are inherited. In the introductory stack example, we used
-<tt>-mixin</tt> applied to an object to denote per-object mixins (see
-<a href="#xmp-using-class-safety">Listing 8</a>). Since <tt>mixin</tt>
-is defined as a parameter on <tt>nx::Object</tt> it can be used as an object
-parameter <tt>-mixin</tt> for all objects in NX. To put it in other words,
+<code>Person</code> is a subclass of <code>nx::Object</code> also the object parameters of
+<code>nx::Object</code> are inherited. In the introductory stack example, we used
+<code>-mixin</code> applied to an object to denote per-object mixins (see
+<a href="#xmp-using-class-safety">Listing 8</a>). Since <code>mixin</code>
+is defined as a parameter on <code>nx::Object</code> it can be used as an object
+parameter <code>-mixin</code> for all objects in NX. To put it in other words,
 every object can be configured to have per-object mixins. If we would
 remove this definition, this feature would be removed as well.</p></div>
 <div class="paragraph"><p>As shown in the introductory examples, every object can be configured
@@ -3698,7 +3700,7 @@
 scripted block and its meaning are as well defined by the means of
 object parameters. However, this object parameter is positional (last
 argument) and optional (it can be omitted). The following listing shows
-(simplified) the object parameters of <tt>Person p1</tt> and <tt>Student s1</tt>.</p></div>
+(simplified) the object parameters of <code>Person p1</code> and <code>Student s1</code>.</p></div>
 <div class="paragraph" id="xmp-object-parameter-list"><div class="title">Listing 45: Computed Actual Object Parameter (simplified)</div><p></p></div>
 <div class="listingblock">
 <div class="content"><style type='text/css'>
@@ -3727,40 +3729,40 @@
    -matnr:required {-oncampus:boolean true}
    -name:required -birthday ...
    -mixin:mixinreg,<span class='nx-keyword'>alias</span>,1..n -filter:filterreg,<span class='nx-keyword'>alias</span>,1..n _:initcmd,optional</pre></td></tr></table></div></div>
-<div class="paragraph"><p>The actual values can be obtained via introspection via <tt>Person info
-parameter definition</tt>. The object parameter types <tt>mixinreg</tt> and
-<tt>filterreg</tt> are for converting definitions of filters and mixins.  The
-object parameter type <tt>initcmd</tt> says that the content of this variable
+<div class="paragraph"><p>The actual values can be obtained via introspection via <code>Person info
+parameter definition</code>. The object parameter types <code>mixinreg</code> and
+<code>filterreg</code> are for converting definitions of filters and mixins.  The
+object parameter type <code>initcmd</code> says that the content of this variable
 will be executed in the context of the object being created (before
-the constructor <tt>init</tt> is called).  More about the object parameter
+the constructor <code>init</code> is called).  More about the object parameter
 types later.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_object_parameters_for_all_nx_classes">4.3.2. Object Parameters for all NX Classes</h4>
 <div class="paragraph"><p>Since classes are certain kind of objects, classes are parameterized
 in the same way as objects. A typical parameter for a class definition
 is the relation of the class to its superclass.In our example, we have
-specified, that <tt>Student</tt> has <tt>Person</tt> as superclass via the
-non-positional object parameter <tt>-superclass</tt>. If no superclass is
+specified, that <code>Student</code> has <code>Person</code> as superclass via the
+non-positional object parameter <code>-superclass</code>. If no superclass is
 specified for a class, the default superclass is
-<tt>nx::Object</tt>. Therefore <tt>nx::Object</tt> is the default value for the
-parameter <tt>superclass</tt>.</p></div>
-<div class="paragraph"><p>Another frequently used parameter for classes is <tt>-mixin</tt> to denote
+<code>nx::Object</code>. Therefore <code>nx::Object</code> is the default value for the
+parameter <code>superclass</code>.</p></div>
+<div class="paragraph"><p>Another frequently used parameter for classes is <code>-mixin</code> to denote
 per-class mixins (see e.g. the introductory Stack example in
 <a href="#xmp-class-safestack">Listing 10</a>), which is defined in
 the same way.</p></div>
-<div class="paragraph"><p>Since <tt>Student</tt> is an instance of the meta-class <tt>nx::Class</tt> it
-inherits the object parameters from <tt>nx::Class</tt> (see class diagram
+<div class="paragraph"><p>Since <code>Student</code> is an instance of the meta-class <code>nx::Class</code> it
+inherits the object parameters from <code>nx::Class</code> (see class diagram
 <a href="#img-object-parameters">Figure 44</a>). Therefore, one can
-use e.g. <tt>-superclass</tt> in the definition of classes.</p></div>
-<div class="paragraph"><p>Since <tt>nx::Class</tt> is a subclass of <tt>nx::Object</tt>, the meta-class
-<tt>nx::Class</tt> inherits the parameter definitions from the most general
-class <tt>nx::Object</tt>. Therefore, every class might as well be configured
+use e.g. <code>-superclass</code> in the definition of classes.</p></div>
+<div class="paragraph"><p>Since <code>nx::Class</code> is a subclass of <code>nx::Object</code>, the meta-class
+<code>nx::Class</code> inherits the parameter definitions from the most general
+class <code>nx::Object</code>. Therefore, every class might as well be configured
 with a scripted initialization block the same way as objects can be
 configured. We used actually this scripted initialization block in
 most examples for defining the methods of the class. The following
-listing shows (simplified) the parameters applicable for <tt>Class
-Student</tt>.</p></div>
+listing shows (simplified) the parameters applicable for <code>Class
+Student</code>.</p></div>
 <div class="paragraph" id="xmp-class-parameter-list"><div class="title">Listing 46: Computed Parameters for a Class (simplified)</div><p></p></div>
 <div class="listingblock">
 <div class="content"><style type='text/css'>
@@ -3779,8 +3781,8 @@
 </pre></td><td class='nx-body'><pre class='nx'><span class='nx-keyword'>Object</span> parameter <span class='nx-keyword'>for</span> <span class='nx-keyword'>Class</span> Student:
    -mixin:mixinreg,<span class='nx-keyword'>alias</span>,1..n -filter:filterreg,<span class='nx-keyword'>alias</span>,1..n ...
    {-superclass<span class='nx-keyword'>:class</span>,<span class='nx-keyword'>alias</span>,1..n ::nx::Object} ...</pre></td></tr></table></div></div>
-<div class="paragraph"><p>The actual values can be obtained via introspection via <tt>nx::Class info
-parameter definition</tt>.</p></div>
+<div class="paragraph"><p>The actual values can be obtained via introspection via <code>nx::Class info
+parameter definition</code>.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_user_defined_parameter_types">4.3.3. User defined Parameter Types</h4>
@@ -3789,7 +3791,7 @@
 <div class="sect3">
 <h4 id="_slot_classes_and_slot_objects">4.3.4. Slot Classes and Slot Objects</h4>
 <div class="paragraph"><p>In one of the previous sections, we defined scripted (application
-defined) checker methods on a class named <tt>nx::Slot</tt>.  In general NX
+defined) checker methods on a class named <code>nx::Slot</code>.  In general NX
 offers the possibility to define value checkers not only for all
 usages of parameters but as well differently for method parameters or
 object parameters</p></div>
@@ -3864,7 +3866,7 @@
 <div class="sect3">
 <h4 id="_unknown_handlers_for_methods">5.2.1. Unknown Handlers for Methods</h4>
 <div class="paragraph"><p>Object and classes might be equipped
-with a method <tt>unknown</tt> which is called in cases, where an unknown
+with a method <code>unknown</code> which is called in cases, where an unknown
 method is called. The method unknown receives as first argument the
 called method followed by the provided arguments</p></div>
 <div class="paragraph" id="xmp-unknown-method"><div class="title">Listing 48: Unknown Method Handler</div><p></p></div>
@@ -3945,7 +3947,7 @@
  20
  21
  22
-</pre></td><td class='nx-body'><pre class='nx'>::nx::Class <span class='nx-keyword'>public</span> <span class='nx-keyword'>class</span> <span class='nx-keyword'>method</span> __unknown {name} {
+</pre></td><td class='nx-body'><pre class='nx'>::nx::Class <span class='nx-keyword'>public</span> <span class='nx-keyword'>object</span> <span class='nx-keyword'>method</span> __unknown {name} {
   <span class='nx-comment'># A very simple unknown handler, showing just how
 </span>  <span class='nx-comment'># the mechanism works.
 </span>  <span class='nx-keyword'>puts</span> <span class='nx-string'>"***** __unknown called with &lt;$name&gt;"</span>
@@ -4072,8 +4074,8 @@
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Version 2.1<br />
-Last updated 2012-05-22 10:28:25 CEST
+Version 2.2<br />
+Last updated 2013-05-04 15:55:19 CEST
 </div>
 </div>
 </body>
Index: doc/next-tutorial/next-tutorial.txt
===================================================================
diff -u -r26480a59b14cf250904da0cdc7d895f21b0ed5fd -rd00b7a9fa608e137faea6e52ded881b871d5c29e
--- doc/next-tutorial/next-tutorial.txt	(.../next-tutorial.txt)	(revision 26480a59b14cf250904da0cdc7d895f21b0ed5fd)
+++ doc/next-tutorial/next-tutorial.txt	(.../next-tutorial.txt)	(revision d00b7a9fa608e137faea6e52ded881b871d5c29e)
@@ -1,7 +1,7 @@
 Tutorial for the Next Scripting Language
 ==========================================
 Gustaf Neumann <neumann@wu-wien.ac.at>, Stefan Sobernig <stefan.sobernig@wu.ac.at>
-v2.1, March 2011:
+v2.2, May 2013:
 Written for the Initial Release of the Next Scripting Framework.
 :Author Initials: GN
 :toc:
@@ -39,7 +39,7 @@
 the universal method combinator "next", which was introduced in XOTcl.
 The combinator "next" serves as a single instrument for method
 combination with filters, per-object and transitive per-class mixin
-classes, per-object methods and multiple inheritance.
+classes, object methods and multiple inheritance.
 
 The definition of NX is fully scripted (e.g.  defined in
 +nx.tcl+). The Next Scripting Framework is shipped with three language
@@ -256,29 +256,27 @@
 specific methods_. With NX, we can define generic objects, which are
 instances of the most generic class +nx::Object+ (sometimes called
 "common root class"). +nx::Object+ is predefined and contains a
-minimal set of methods applicable to all NX objects. 
+minimal set of methods applicable to all NX objects.  In this example,
+we define a generic object named +stack+ and provide methods for this
+object. The methods defined above were methods provided by a class for
+objects. Now we define object specific methods, which are methods
+applicable only to the object for which they are defined.
 
-In our second example, we will define a generic object named +stack+
-and provide methods for this object. The methods defined in our first
-example were methods provided by a class for objects. Now we defined
-object specific methods, which are methods applicable only to the 
-object for which they are defined.
-
 [[xmp-object-stack]]
 .Listing {counter:figure-number}: Object stack
 {set:xmp-object-stack:Listing {figure-number}}
 [source,tcl,numbers]
 --------------------------------------------------
 nx::Object create stack {
 
-   :variable things {}
+   :object variable things {}
 
-   :public method push {thing} {
+   :public object method push {thing} {
       set :things [linsert ${:things} 0 $thing] 
       return $thing
    }
   
-   :public method pop {} {
+   :public object method pop {} {
       set top [lindex ${:things} 0]
       set :things [lrange ${:things} 1 end]
       return $top
@@ -293,12 +291,14 @@
 - First, we use +nx::Object+ instead of +nx::Class+ to denote
   that we want to create a generic object, not a class.
 
-- As in the example above, we use +:variable+ to define the
-  instance variable +things+ for this object (the object +stack+).
+- We use +:object variable+ to define the variable +things+  just for
+   this single instance  (the object +stack+).
 
-The definition for the methods +push+ and +pop+ are the same as
-before, but this times these methods are object-specific (in general,
-all methods defined for an object are object-specific). In order to use
+- The definition for the methods +push+ and +pop+ are the same as
+  before, but here we defined these with +object method+. Therefore, 
+  these two methods +push+ and +pop+ are object-specific.
+
+In order to use
 the stack, we can use directly the object +stack+ in the same way as
 we have used the object +s1+ in <<xmp-using-stack, {xmp-using-stack}>>
 (e.g. +stack push a+).  <<img-object-stack, {img-object-stack}>> shows
@@ -311,7 +311,7 @@
 A reader might wonder when to use a class +Stack+ or rather an object
 +stack+. A big difference is certainly that one can define easily
 multiple instances of a class, while the object is actually a
-singleton. The concept of the object +stack+ is similar to a module,
+single, tailored entity. The concept of the object +stack+ is similar to a module,
 providing a certain functionality via a common interface, without
 providing the functionality to create multiple instances. The reuse of
 methods provided by the class to objects is as well a difference. If
@@ -402,7 +402,7 @@
 ::Safety
 % Stack create s1
 ::s1
-% Stack create s2 -mixin Safety
+% Stack create s2 -object-mixin Safety
 ::s2
 % s2 push a
 a
@@ -428,8 +428,9 @@
 mixin class +Safety+ generates an error message (raises an exception),
 and does not invoke the method of the +Stack+.
 
-The last two commands in <<xmp-using-class-safety,
-{xmp-using-class-safety}>> use introspection to query for the objects
+The last two commands in 
+<<xmp-using-class-safety,{xmp-using-class-safety}>> 
+use introspection to query for the objects
 +s1+ and +s2+ in which order the involved classes are processed. This
 order is called the +precedence order+ and is obtained via +info
 precedence+. We see that the mixin class +Safety+ is only in use for
@@ -440,15 +441,15 @@
 image::per-object-mixin.png[title="Per-object Mixin",align="center"]
 {set:img-per-object-mixin:Figure {figure-number}}
 
-Note that the class +Safety+ is only mixed into a single object (here
+Note that in <<xmp-using-class-safety,{xmp-using-class-safety}>>,
+the class +Safety+ is only mixed into a single object (here
 +s2+), therefore we refer to this case as a _per-object mixin_.
 <<img-per-object-mixin,{img-per-object-mixin}>> shows the class
 diagram, where the class +Safety+ is used as a per-object mixin for
 +s2+.
 
-The class +Safety+ can be used as well in other ways, such as e.g. for
-defining classes for safe stacks <<xmp-class-safestack,
-{xmp-class-safestack}>>.
+The mixin class +Safety+ can be used as well in other ways, such as e.g. for
+defining classes of safe stacks:
 
 [[xmp-class-safestack]]
 .Listing {counter:figure-number}: Class SafeStack
@@ -464,17 +465,20 @@
 SafeStack create s3
 --------------------------------------------------
 
-The difference to the case with the per-object mixin is that now,
-+Safety+ is mixed into the definition of +SafeStack+. Therefore, all
-instances of the class +SafeStack+ (here the instance +s3+) will be
-using the safety definitions.
-<<img-per-class-mixin,{img-per-class-mixin}>> shows the class diagram
-for this definition.
+The difference of a per-class mixin and an per-object mixin is that
+the per-class mixin is applicable to all instances of the
+class. Therefore, we call these mixins also sometimes instance mixins.
+In our example in <<xmp-class-safestack,{xmp-class-safestack}>>, 
++Safety+ is mixed into the definition of
++SafeStack+. Therefore, all instances of the class +SafeStack+ (here
+the instance +s3+) will be using the safety definitions.
 
 [[img-per-class-mixin]]
 image::per-class-mixin.png[title="Per-class Mixin",align="center"]
 {set:img-per-class-mixin:Figure {figure-number}}
 
+<<img-per-class-mixin,{img-per-class-mixin}>> shows the class diagram
+for this definition.
 Note that we could use +Safety+ as well as a per-class mixin on
 +Stack+. In this case, all stacks would be safe stacks and we could
 not provide a selective feature selection (which might be perfectly
@@ -501,7 +505,7 @@
   # to check the type of entries 
   #
 
-  :public method push {thing:integer} {
+  :public object method push {thing:integer} {
     next
   }
 }
@@ -545,25 +549,22 @@
 +IntegerStack+ is defined, using the same method definition
 as +s4+, this time on the class level.
 
-=== Define Class Specific Methods
+=== Define Object Specific Methods on Classes
 
 In our previous examples we defined methods provided by classes
 (applicable for their instances) and object-specific methods (methods
 defined on objects, which are only applicable for these objects). In
-this section, we introduce methods that are defined on classes. These
-method are only applicable for the class objects. Such methods are
-sometimes called _class methods_ or _static methods_.
+this section, we introduce methods that are defined on the class
+objects. Such methods are sometimes called _class methods_ or 
+_static methods_.
 
-In NX classes are objects with certain properties. The classes are
-objects providing methods for instance and which are managing the
-life-cycles of the objects (we will come to this point in later
-sections in more detail). Since classes are objects, it is also
-possible to define object-specific methods for the class
-objects. However, since +:method+ applied on classes defines methods
-for instances, we have to use the method-modifier +class+ to denote
-methods to be applied on the class itself. Note that instances do not
-inherit class methods. The methods defined on the class object are
-actually exactly same as the object-specific methods shown in the
+In NX classes are objects, they are specialized objects with
+additional methods. Methods for classes are often used for managing
+the life-cycles of the instances of the classes (we will come to this
+point in later sections in more detail). Since classes are objects, we
+can use exactly the same notation as above to define class methods by
+using +object method+. The methods defined on the class object are
+in all respects idential with object specific methods shown in the
 examples above.
 
 [[xmp-stack2]]
@@ -573,7 +574,7 @@
 --------------------------------------------------
 nx::Class create Stack2 {
 
-   :public class method available_stacks {} {
+   :public object method available_stacks {} {
       return [llength [:info instances]]
    }
 
@@ -952,7 +953,7 @@
   :public method bark {} { puts "[self] Bark, bark, bark." }
   :method init {} { 
     Tail create [self]::tail
-    :public forward wag [self]::tail wag
+    :public object forward wag [self]::tail wag
   }
 }
 
@@ -1136,7 +1137,7 @@
 By using the +-local+ flag at the call site it is possible to invoce
 only the local definition of the method. If we would call the method
 without this flag, the resolution order would be the standard
-resolution order, starting with filters, mixins, per-object methods
+resolution order, starting with filters, mixins, object methods
 and the full intrinsic class hierarchy.
 
 NX supports the modifier +private+ for methods and properties. In all
@@ -1227,29 +1228,29 @@
 ==== Object Methods
 
 ===========================================
-Methods defined on objects are *per-object methods*. Per-object
+Methods defined on objects are *object methods*. Object
 methods are only applicable on the object, on which they are defined.
-Per-object methods cannot be inherited from other objects.
+Object methods cannot be inherited from other objects.
 ===========================================
 
-The following example defines an object specific method +bar+ on the
+The following example defines an object method +bar+ on the
 instance +c1+ of class +C+, and as well as the object specific method
-+baz+ defined on the object +o1+. An object-specific method is defined
-simply by defining the method on an object. 
++baz+ defined on the object +o1+. An object method is defined
+via +object method+. 
 
-Note that we can define a per-object method that shadows (redefines)
-for this object an intrinsic instance method.
+Note that we can define a object method that shadows (redefines)
+for this object methods provided from classes.
 
 [[xmp-object-applicable1]]
-.Listing {counter:figure-number}: Per-object Method
+.Listing {counter:figure-number}: Object Method
 {set:xmp-object-applicable1:Listing {figure-number}}
 [source,tcl,numbers]
 --------------------------------------------------
 nx::Class create C {
   :public method foo {} {return 1}
   :create c1 {
-     :public method foo {} {return 2}
-     :public method bar {} {return 3}
+     :public object method foo {} {return 2}
+     :public object method bar {} {return 3}
   }
 }
 
@@ -1261,7 +1262,7 @@
 
 # Method "baz" is an object specific method of "o1"
 nx::Object create o1 {
-  :public method baz {} {return 4}
+  :public object method baz {} {return 4}
 }
 o1 baz
 --------------------------------------------------
@@ -1270,8 +1271,8 @@
 
 =========================================
 A *class method* is a method defined on a class, which is only
-applicable to the class object itself. The class method is a
-per-object method of the class object.
+applicable to the class object itself. The class method is actually
+an object method of the class object.
 =========================================
 
 In NX, all classes are objects. Classes are in NX special kind of
@@ -1281,7 +1282,7 @@
 this later).
 
 The following example defines a public class method +bar+ on class
-+C+. The class method is specified by using the modifier +class+ in
++C+. The class method is specified by using the modifier +object+ in
 front of +method+ in the method definition command.
 
 [[xmp-object-applicable2]]
@@ -1294,7 +1295,7 @@
   # Define a class method "bar" and an instance
   # method "foo"
   #
-  :public class method bar {} {return 2}
+  :public object method bar {} {return 2}
   :public method foo {} {return 1}
 
   #
@@ -1373,7 +1374,7 @@
 ++++ 
 
 In the case, no mixins are involved, first the object is searched for
-a per-object method with the given name, and then the class hierarchy
+an object method with the given name, and then the class hierarchy
 of the object. The method can be defined multiple times on the search
 path, so some of these method definitions might be _shadowed_ by the
 more specific definitions. 
@@ -1392,7 +1393,7 @@
   :public method foo {} { return "D foo: [next]"}
 
    :create d1 {
-     :public method foo {} { return "d1 foo: [next]"}
+     :public object method foo {} { return "d1 foo: [next]"}
    }
 }
 
@@ -1407,8 +1408,8 @@
 
 Consider the example in
 <<xmp-method-resolution,{xmpmethod-resolution}>>. When the method
-+foo+ is invoked on object +d1+, the per-object method has the highest
-precedence and is therefore invoked. The per-object methods shadows
++foo+ is invoked on object +d1+, the object method has the highest
+precedence and is therefore invoked. The object methods shadows
 the same-named methods in the class hierarchy, namely the method +foo+
 of class +D+ and the method +foo+ of class +C+. The shadowed methods
 can be still invoked, either via the primitive +next+ or via method
@@ -1438,7 +1439,7 @@
 # "d1" is created based on the definitions of the last example
 # 
 # Add the methods from "M1" as per-object mixin to "d1"
-d1 mixin M1
+d1 object mixin M1
 
 #
 # Add the methods from "M2" as per-class mixin to class "C"
@@ -1471,10 +1472,10 @@
 # "d1" is created based on the definitions of the last two examples,
 # the mixins "M1" and "M2" are registered. 
 # 
-# Define a public per-object method "bar", which calls the method
+# Define a public object method "bar", which calls the method
 # "foo" which various invocation options:
 #
-d1 public method bar {} {
+d1 public object method bar {} {
    puts [:foo]
    puts [: -local foo]
    puts [: -intrinsic foo]
@@ -1495,8 +1496,8 @@
 
 The invocation flag +-local+ means that the method has to be resolved
 from the same place, where the current method is defined. Since the
-current method is defined as a per-object method, +foo+ is resolved as
-a per-object method. The effect is that the mixin definitions are
+current method is defined as a object method, +foo+ is resolved as
+a object method. The effect is that the mixin definitions are
 ignored. The invocation flag +-local+ was already introduced int the
 section about method protection, where it was used to call _private_
 methods.
@@ -2272,7 +2273,7 @@
 {set:xmp-unknown-class:Listing {figure-number}}
 [source,tcl,numbers]
 --------------------------------------------------
-::nx::Class public class method __unknown {name} {
+::nx::Class public object method __unknown {name} {
   # A very simple unknown handler, showing just how
   # the mechanism works.
   puts "***** __unknown called with <$name>"
Index: doc/next-tutorial/object-class-appclass.graffle
===================================================================
diff -u -re1a3b4786ffd146bbc52f4ac2276df3f9bc9122e -rd00b7a9fa608e137faea6e52ded881b871d5c29e
--- doc/next-tutorial/object-class-appclass.graffle	(.../object-class-appclass.graffle)	(revision e1a3b4786ffd146bbc52f4ac2276df3f9bc9122e)
+++ doc/next-tutorial/object-class-appclass.graffle	(.../object-class-appclass.graffle)	(revision d00b7a9fa608e137faea6e52ded881b871d5c29e)
@@ -2,25 +2,105 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CanvasColor</key>
+	<key>ActiveLayerIndex</key>
+	<integer>0</integer>
+	<key>ApplicationVersion</key>
+	<array>
+		<string>com.omnigroup.OmniGrafflePro</string>
+		<string>139.7.0.167456</string>
+	</array>
+	<key>AutoAdjust</key>
+	<false/>
+	<key>BackgroundGraphic</key>
 	<dict>
-		<key>w</key>
-		<string>1</string>
+		<key>Bounds</key>
+		<string>{{0, 0}, {559, 783}}</string>
+		<key>Class</key>
+		<string>SolidGraphic</string>
+		<key>ID</key>
+		<integer>2</integer>
+		<key>Style</key>
+		<dict>
+			<key>shadow</key>
+			<dict>
+				<key>Draws</key>
+				<string>NO</string>
+			</dict>
+			<key>stroke</key>
+			<dict>
+				<key>Draws</key>
+				<string>NO</string>
+			</dict>
+		</dict>
 	</dict>
+	<key>BaseZoom</key>
+	<integer>0</integer>
+	<key>CanvasOrigin</key>
+	<string>{0, 0}</string>
 	<key>ColumnAlign</key>
 	<integer>1</integer>
 	<key>ColumnSpacing</key>
 	<real>36</real>
 	<key>CreationDate</key>
-	<string>2009-12-29 16:06:59 +0100</string>
+	<string>2009-12-29 15:06:59 +0000</string>
 	<key>Creator</key>
 	<string>Gustaf A. Neumann</string>
+	<key>DisplayScale</key>
+	<string>1.000 cm = 1.000 cm</string>
 	<key>GraphDocumentVersion</key>
-	<integer>4</integer>
+	<integer>8</integer>
 	<key>GraphicsList</key>
 	<array>
 		<dict>
+			<key>Bounds</key>
+			<string>{{294.22932457169577, 352.66014462624321}, {75, 24}}</string>
 			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>ID</key>
+			<integer>9</integer>
+			<key>Line</key>
+			<dict>
+				<key>ID</key>
+				<integer>8</integer>
+				<key>Position</key>
+				<real>0.34574294090270996</real>
+				<key>RotationType</key>
+				<integer>0</integer>
+			</dict>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Align</key>
+				<integer>0</integer>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
+
+\f0\fs18 \cf0 instance of}</string>
+				<key>VerticalPad</key>
+				<integer>0</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>AllowLabelDrop</key>
+			<false/>
+			<key>Class</key>
 			<string>LineGraphic</string>
 			<key>Head</key>
 			<dict>
@@ -29,32 +109,9 @@
 			</dict>
 			<key>ID</key>
 			<integer>8</integer>
-			<key>Labels</key>
-			<array>
-				<dict>
-					<key>Label</key>
-					<dict>
-						<key>Align</key>
-						<integer>0</integer>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-
-\f0\fs18 \cf0 instance of}</string>
-					</dict>
-					<key>LabelVisible</key>
-					<string>YES</string>
-					<key>Offset</key>
-					<real>0.0</real>
-					<key>Position</key>
-					<real>0.34574294090270996</real>
-				</dict>
-			</array>
 			<key>Points</key>
 			<array>
-				<string>{328.652, 336.346}</string>
+				<string>{328.65168972523446, 336.346}</string>
 				<string>{329, 372}</string>
 				<string>{289, 388}</string>
 			</array>
@@ -64,6 +121,8 @@
 				<dict>
 					<key>HeadArrow</key>
 					<string>0</string>
+					<key>Legacy</key>
+					<true/>
 					<key>LineType</key>
 					<integer>1</integer>
 					<key>Pattern</key>
@@ -94,18 +153,26 @@
 			</array>
 			<key>Shape</key>
 			<string>Rectangle</string>
+			<key>Style</key>
+			<dict/>
 			<key>Text</key>
 			<dict>
+				<key>Align</key>
+				<integer>0</integer>
 				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\b\fs24 \cf0 s1: Stack}</string>
+				<key>VerticalPad</key>
+				<integer>0</integer>
 			</dict>
 		</dict>
 		<dict>
+			<key>AllowLabelDrop</key>
+			<false/>
 			<key>Class</key>
 			<string>LineGraphic</string>
 			<key>Head</key>
@@ -117,15 +184,17 @@
 			<integer>6</integer>
 			<key>Points</key>
 			<array>
-				<string>{318.496, 238.346}</string>
-				<string>{298.677, 138}</string>
+				<string>{318.49562705626812, 238.346}</string>
+				<string>{298.67755225194736, 138}</string>
 			</array>
 			<key>Style</key>
 			<dict>
 				<key>stroke</key>
 				<dict>
 					<key>HeadArrow</key>
 					<string>UMLInheritance</string>
+					<key>Legacy</key>
+					<true/>
 					<key>LineType</key>
 					<integer>1</integer>
 					<key>TailArrow</key>
@@ -139,7 +208,55 @@
 			</dict>
 		</dict>
 		<dict>
+			<key>Bounds</key>
+			<string>{{175.8580453437697, 281.61092918333759}, {75, 24}}</string>
 			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>ID</key>
+			<integer>10</integer>
+			<key>Line</key>
+			<dict>
+				<key>ID</key>
+				<integer>5</integer>
+				<key>Position</key>
+				<real>0.52006572484970093</real>
+				<key>RotationType</key>
+				<integer>0</integer>
+			</dict>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Align</key>
+				<integer>0</integer>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
+
+\f0\fs18 \cf0 instance of}</string>
+				<key>VerticalPad</key>
+				<integer>0</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>AllowLabelDrop</key>
+			<false/>
+			<key>Class</key>
 			<string>LineGraphic</string>
 			<key>Head</key>
 			<dict>
@@ -148,42 +265,21 @@
 			</dict>
 			<key>ID</key>
 			<integer>5</integer>
-			<key>Labels</key>
-			<array>
-				<dict>
-					<key>Label</key>
-					<dict>
-						<key>Align</key>
-						<integer>0</integer>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-
-\f0\fs18 \cf0 instance of}</string>
-					</dict>
-					<key>LabelVisible</key>
-					<string>YES</string>
-					<key>Offset</key>
-					<real>0.0</real>
-					<key>Position</key>
-					<real>0.52006572484970093</real>
-				</dict>
-			</array>
 			<key>Points</key>
 			<array>
-				<string>{190, 239.572}</string>
+				<string>{190, 239.57152252252251}</string>
 				<string>{233, 255}</string>
 				<string>{206, 312}</string>
-				<string>{260.173, 301.068}</string>
+				<string>{260.173, 301.06811536100446}</string>
 			</array>
 			<key>Style</key>
 			<dict>
 				<key>stroke</key>
 				<dict>
 					<key>HeadArrow</key>
 					<string>0</string>
+					<key>Legacy</key>
+					<true/>
 					<key>LineType</key>
 					<integer>1</integer>
 					<key>Pattern</key>
@@ -195,76 +291,148 @@
 			<key>Tail</key>
 			<dict>
 				<key>ID</key>
-				<integer>2</integer>
+				<integer>14</integer>
 			</dict>
 		</dict>
 		<dict>
-			<key>Bounds</key>
-			<string>{{260.173, 238.346}, {136, 98}}</string>
 			<key>Class</key>
-			<string>MultiTextGraphic</string>
-			<key>FitText</key>
-			<string>Vertical</string>
-			<key>Flow</key>
-			<string>Resize</string>
-			<key>ID</key>
-			<integer>4</integer>
-			<key>ListOrientation</key>
-			<string>Vertical</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>GradientAngle</key>
-					<real>304</real>
-					<key>GradientCenter</key>
-					<string>{-0.294118, -0.264706}</string>
-				</dict>
-			</dict>
-			<key>TextList</key>
+			<string>TableGroup</string>
+			<key>Graphics</key>
 			<array>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{260.173, 238.346}, {136, 14}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>11</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\b\fs24 \cf0 Stack}</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{260.173, 252.346}, {136, 28}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>12</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\fs24 \cf0 \
 }</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{260.173, 280.346}, {136, 56}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>13</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\fs24 \cf0 init\
 push\
 pop\
 }</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 			</array>
-			<key>TextPlacement</key>
-			<integer>0</integer>
+			<key>GridH</key>
+			<array>
+				<integer>11</integer>
+				<integer>12</integer>
+				<integer>13</integer>
+				<array/>
+			</array>
+			<key>GroupConnect</key>
+			<string>YES</string>
+			<key>ID</key>
+			<integer>4</integer>
 		</dict>
 		<dict>
+			<key>AllowLabelDrop</key>
+			<false/>
 			<key>Class</key>
 			<string>LineGraphic</string>
 			<key>Head</key>
@@ -276,15 +444,17 @@
 			<integer>3</integer>
 			<key>Points</key>
 			<array>
-				<string>{190, 163.797}</string>
-				<string>{224.145, 138}</string>
+				<string>{190, 163.76146014560317}</string>
+				<string>{224.07365923802806, 138}</string>
 			</array>
 			<key>Style</key>
 			<dict>
 				<key>stroke</key>
 				<dict>
 					<key>HeadArrow</key>
 					<string>UMLInheritance</string>
+					<key>Legacy</key>
+					<true/>
 					<key>LineType</key>
 					<integer>1</integer>
 					<key>TailArrow</key>
@@ -294,141 +464,281 @@
 			<key>Tail</key>
 			<dict>
 				<key>ID</key>
-				<integer>2</integer>
+				<integer>14</integer>
 			</dict>
 		</dict>
 		<dict>
-			<key>Bounds</key>
-			<string>{{54, 159.173}, {136, 112}}</string>
 			<key>Class</key>
-			<string>MultiTextGraphic</string>
-			<key>FitText</key>
-			<string>Vertical</string>
-			<key>Flow</key>
-			<string>Resize</string>
-			<key>ID</key>
-			<integer>2</integer>
-			<key>ListOrientation</key>
-			<string>Vertical</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>GradientAngle</key>
-					<real>304</real>
-					<key>GradientCenter</key>
-					<string>{-0.294118, -0.264706}</string>
-				</dict>
-			</dict>
-			<key>TextList</key>
+			<string>TableGroup</string>
+			<key>Graphics</key>
 			<array>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{54, 159.173}, {136, 14}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>15</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\b\fs24 \cf0 nx::Class}</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{54, 173.173}, {136, 28}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>16</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\fs24 \cf0 \
 }</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{54, 201.173}, {136, 70}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>17</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
-\f0\fs24 \cf0 attribute\
-class-object\
+\f0\fs24 \cf0 variable\
 create\
 method\
-...}</string>
+...\
+}</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 			</array>
-			<key>TextPlacement</key>
-			<integer>0</integer>
+			<key>GridH</key>
+			<array>
+				<integer>15</integer>
+				<integer>16</integer>
+				<integer>17</integer>
+				<array/>
+			</array>
+			<key>GroupConnect</key>
+			<string>YES</string>
+			<key>ID</key>
+			<integer>14</integer>
 		</dict>
 		<dict>
-			<key>Bounds</key>
-			<string>{{221, 40}, {136, 98}}</string>
 			<key>Class</key>
-			<string>MultiTextGraphic</string>
-			<key>FitText</key>
-			<string>Vertical</string>
-			<key>Flow</key>
-			<string>Resize</string>
-			<key>ID</key>
-			<integer>1</integer>
-			<key>ListOrientation</key>
-			<string>Vertical</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>GradientAngle</key>
-					<real>304</real>
-					<key>GradientCenter</key>
-					<string>{-0.294118, -0.264706}</string>
-				</dict>
-			</dict>
-			<key>TextList</key>
+			<string>TableGroup</string>
+			<key>Graphics</key>
 			<array>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{221, 40}, {136, 14}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>18</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\b\fs24 \cf0 nx::Object}</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{221, 54}, {136, 28}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>19</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\fs24 \cf0 \
 }</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{221, 82}, {136, 56}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>20</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\fs24 \cf0 info\
 destroy\
-method\
-...}</string>
+...\
+}</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 			</array>
-			<key>TextPlacement</key>
-			<integer>0</integer>
+			<key>GridH</key>
+			<array>
+				<integer>18</integer>
+				<integer>19</integer>
+				<integer>20</integer>
+				<array/>
+			</array>
+			<key>GroupConnect</key>
+			<string>YES</string>
+			<key>ID</key>
+			<integer>1</integer>
 		</dict>
 	</array>
 	<key>GridInfo</key>
@@ -446,8 +756,8 @@
 	<integer>1</integer>
 	<key>ImageCounter</key>
 	<integer>1</integer>
-	<key>IsPalette</key>
-	<string>NO</string>
+	<key>KeepToScale</key>
+	<false/>
 	<key>Layers</key>
 	<array>
 		<dict>
@@ -463,146 +773,97 @@
 	</array>
 	<key>LayoutInfo</key>
 	<dict>
-		<key>ChildOrdering</key>
-		<integer>0</integer>
+		<key>Animate</key>
+		<string>NO</string>
+		<key>circoMinDist</key>
+		<real>18</real>
+		<key>circoSeparation</key>
+		<real>0.0</real>
+		<key>layoutEngine</key>
+		<string>dot</string>
+		<key>neatoSeparation</key>
+		<real>0.0</real>
+		<key>twopiSeparation</key>
+		<real>0.0</real>
 	</dict>
 	<key>LinksVisible</key>
 	<string>NO</string>
 	<key>MagnetsVisible</key>
 	<string>NO</string>
+	<key>MasterSheets</key>
+	<array/>
 	<key>ModificationDate</key>
-	<string>2011-01-08 18:45:51 +0100</string>
+	<string>2013-05-04 13:20:30 +0000</string>
 	<key>Modifier</key>
 	<string>Gustaf A. Neumann</string>
+	<key>NotesVisible</key>
+	<string>NO</string>
 	<key>Orientation</key>
 	<integer>2</integer>
+	<key>OriginVisible</key>
+	<string>NO</string>
 	<key>PageBreaks</key>
 	<string>YES</string>
-	<key>PageSetup</key>
-	<data>
-	BAt0eXBlZHN0cmVhbYED6IQBQISEhAtOU1ByaW50SW5mbwGEhAhOU09iamVjdACFkoSE
-	hBNOU011dGFibGVEaWN0aW9uYXJ5AISEDE5TRGljdGlvbmFyeQCUhAFpFpKEhIQITlNT
-	dHJpbmcBlIQBKxBOU0pvYkRpc3Bvc2l0aW9uhpKEmZkPTlNQcmludFNwb29sSm9ihpKE
-	mZkLTlNQYXBlclNpemWGkoSEhAdOU1ZhbHVlAJSEASqEhAx7X05TU2l6ZT1mZn2cgQJT
-	gQNKhpKEmZkUTlNWZXJ0aWNhbFBhZ2luYXRpb26GkoSEhAhOU051bWJlcgCdm4SXlwCG
-	koSZmQ9OU1BhZ2VzUGVyU2hlZXSGkoShm6KXAYaShJmZFE5TVmVydGljYWxseUNlbnRl
-	cmVkhpKkkoSZmRlOU1ByaW50UmV2ZXJzZU9yaWVudGF0aW9uhpKgkoSZmQ9OU1ByaW50
-	QWxsUGFnZXOGkqCShJmZC05TUGFwZXJOYW1lhpKEmZkGaXNvLWE0hpKEmZkITlNDb3Bp
-	ZXOGkqSShJmZD05TU2NhbGluZ0ZhY3RvcoaShKGbhIQBZJ4BhpKEmZkOTlNQTVBhZ2VG
-	b3JtYXSGkoSEhA1OU011dGFibGVEYXRhAISEBk5TRGF0YQCUl4EVL4QHWzU0MjNjXTw/
-	eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04Ij8+CjwhRE9DVFlQRSBwbGlz
-	dCBQVUJMSUMgIi0vL0FwcGxlLy9EVEQgUExJU1QgMS4wLy9FTiIgImh0dHA6Ly93d3cu
-	YXBwbGUuY29tL0RURHMvUHJvcGVydHlMaXN0LTEuMC5kdGQiPgo8cGxpc3QgdmVyc2lv
-	bj0iMS4wIj4KPGRpY3Q+Cgk8a2V5PmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0LlBN
-	SG9yaXpvbnRhbFJlczwva2V5PgoJPGRpY3Q+CgkJPGtleT5jb20uYXBwbGUucHJpbnQu
-	dGlja2V0LmNyZWF0b3I8L2tleT4KCQk8c3RyaW5nPmNvbS5hcHBsZS5qb2J0aWNrZXQ8
-	L3N0cmluZz4KCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuaXRlbUFycmF5PC9r
-	ZXk+CgkJPGFycmF5PgoJCQk8ZGljdD4KCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LlBh
-	Z2VGb3JtYXQuUE1Ib3Jpem9udGFsUmVzPC9rZXk+CgkJCQk8cmVhbD43MjwvcmVhbD4K
-	CQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5zdGF0ZUZsYWc8L2tleT4KCQkJ
-	CTxpbnRlZ2VyPjA8L2ludGVnZXI+CgkJCTwvZGljdD4KCQk8L2FycmF5PgoJPC9kaWN0
-	PgoJPGtleT5jb20uYXBwbGUucHJpbnQuUGFnZUZvcm1hdC5QTU9yaWVudGF0aW9uPC9r
-	ZXk+Cgk8ZGljdD4KCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuY3JlYXRvcjwv
-	a2V5PgoJCTxzdHJpbmc+Y29tLmFwcGxlLmpvYnRpY2tldDwvc3RyaW5nPgoJCTxrZXk+
-	Y29tLmFwcGxlLnByaW50LnRpY2tldC5pdGVtQXJyYXk8L2tleT4KCQk8YXJyYXk+CgkJ
-	CTxkaWN0PgoJCQkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFnZUZvcm1hdC5QTU9yaWVu
-	dGF0aW9uPC9rZXk+CgkJCQk8aW50ZWdlcj4xPC9pbnRlZ2VyPgoJCQkJPGtleT5jb20u
-	YXBwbGUucHJpbnQudGlja2V0LnN0YXRlRmxhZzwva2V5PgoJCQkJPGludGVnZXI+MDwv
-	aW50ZWdlcj4KCQkJPC9kaWN0PgoJCTwvYXJyYXk+Cgk8L2RpY3Q+Cgk8a2V5PmNvbS5h
-	cHBsZS5wcmludC5QYWdlRm9ybWF0LlBNU2NhbGluZzwva2V5PgoJPGRpY3Q+CgkJPGtl
-	eT5jb20uYXBwbGUucHJpbnQudGlja2V0LmNyZWF0b3I8L2tleT4KCQk8c3RyaW5nPmNv
-	bS5hcHBsZS5qb2J0aWNrZXQ8L3N0cmluZz4KCQk8a2V5PmNvbS5hcHBsZS5wcmludC50
-	aWNrZXQuaXRlbUFycmF5PC9rZXk+CgkJPGFycmF5PgoJCQk8ZGljdD4KCQkJCTxrZXk+
-	Y29tLmFwcGxlLnByaW50LlBhZ2VGb3JtYXQuUE1TY2FsaW5nPC9rZXk+CgkJCQk8cmVh
-	bD4xPC9yZWFsPgoJCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0LnN0YXRlRmxh
-	Zzwva2V5PgoJCQkJPGludGVnZXI+MDwvaW50ZWdlcj4KCQkJPC9kaWN0PgoJCTwvYXJy
-	YXk+Cgk8L2RpY3Q+Cgk8a2V5PmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0LlBNVmVy
-	dGljYWxSZXM8L2tleT4KCTxkaWN0PgoJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tl
-	dC5jcmVhdG9yPC9rZXk+CgkJPHN0cmluZz5jb20uYXBwbGUuam9idGlja2V0PC9zdHJp
-	bmc+CgkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0Lml0ZW1BcnJheTwva2V5PgoJ
-	CTxhcnJheT4KCQkJPGRpY3Q+CgkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC5QYWdlRm9y
-	bWF0LlBNVmVydGljYWxSZXM8L2tleT4KCQkJCTxyZWFsPjcyPC9yZWFsPgoJCQkJPGtl
-	eT5jb20uYXBwbGUucHJpbnQudGlja2V0LnN0YXRlRmxhZzwva2V5PgoJCQkJPGludGVn
-	ZXI+MDwvaW50ZWdlcj4KCQkJPC9kaWN0PgoJCTwvYXJyYXk+Cgk8L2RpY3Q+Cgk8a2V5
-	PmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0LlBNVmVydGljYWxTY2FsaW5nPC9rZXk+
-	Cgk8ZGljdD4KCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuY3JlYXRvcjwva2V5
-	PgoJCTxzdHJpbmc+Y29tLmFwcGxlLmpvYnRpY2tldDwvc3RyaW5nPgoJCTxrZXk+Y29t
-	LmFwcGxlLnByaW50LnRpY2tldC5pdGVtQXJyYXk8L2tleT4KCQk8YXJyYXk+CgkJCTxk
-	aWN0PgoJCQkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFnZUZvcm1hdC5QTVZlcnRpY2Fs
-	U2NhbGluZzwva2V5PgoJCQkJPHJlYWw+MTwvcmVhbD4KCQkJCTxrZXk+Y29tLmFwcGxl
-	LnByaW50LnRpY2tldC5zdGF0ZUZsYWc8L2tleT4KCQkJCTxpbnRlZ2VyPjA8L2ludGVn
-	ZXI+CgkJCTwvZGljdD4KCQk8L2FycmF5PgoJPC9kaWN0PgoJPGtleT5jb20uYXBwbGUu
-	cHJpbnQuc3ViVGlja2V0LnBhcGVyX2luZm9fdGlja2V0PC9rZXk+Cgk8ZGljdD4KCQk8
-	a2V5PmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0LlBNQWRqdXN0ZWRQYWdlUmVjdDwv
-	a2V5PgoJCTxkaWN0PgoJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuY3JlYXRv
-	cjwva2V5PgoJCQk8c3RyaW5nPmNvbS5hcHBsZS5qb2J0aWNrZXQ8L3N0cmluZz4KCQkJ
-	PGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0Lml0ZW1BcnJheTwva2V5PgoJCQk8YXJy
-	YXk+CgkJCQk8ZGljdD4KCQkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0
-	LlBNQWRqdXN0ZWRQYWdlUmVjdDwva2V5PgoJCQkJCTxhcnJheT4KCQkJCQkJPGludGVn
-	ZXI+MDwvaW50ZWdlcj4KCQkJCQkJPGludGVnZXI+MDwvaW50ZWdlcj4KCQkJCQkJPHJl
-	YWw+NzgzPC9yZWFsPgoJCQkJCQk8cmVhbD41NTk8L3JlYWw+CgkJCQkJPC9hcnJheT4K
-	CQkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuc3RhdGVGbGFnPC9rZXk+CgkJ
-	CQkJPGludGVnZXI+MDwvaW50ZWdlcj4KCQkJCTwvZGljdD4KCQkJPC9hcnJheT4KCQk8
-	L2RpY3Q+CgkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFnZUZvcm1hdC5QTUFkanVzdGVk
-	UGFwZXJSZWN0PC9rZXk+CgkJPGRpY3Q+CgkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRp
-	Y2tldC5jcmVhdG9yPC9rZXk+CgkJCTxzdHJpbmc+Y29tLmFwcGxlLmpvYnRpY2tldDwv
-	c3RyaW5nPgoJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuaXRlbUFycmF5PC9r
-	ZXk+CgkJCTxhcnJheT4KCQkJCTxkaWN0PgoJCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50
-	LlBhZ2VGb3JtYXQuUE1BZGp1c3RlZFBhcGVyUmVjdDwva2V5PgoJCQkJCTxhcnJheT4K
-	CQkJCQkJPHJlYWw+LTE4PC9yZWFsPgoJCQkJCQk8cmVhbD4tMTg8L3JlYWw+CgkJCQkJ
-	CTxyZWFsPjgyNDwvcmVhbD4KCQkJCQkJPHJlYWw+NTc3PC9yZWFsPgoJCQkJCTwvYXJy
-	YXk+CgkJCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0LnN0YXRlRmxhZzwva2V5
-	PgoJCQkJCTxpbnRlZ2VyPjA8L2ludGVnZXI+CgkJCQk8L2RpY3Q+CgkJCTwvYXJyYXk+
-	CgkJPC9kaWN0PgoJCTxrZXk+Y29tLmFwcGxlLnByaW50LlBhcGVySW5mby5QTVBhcGVy
-	TmFtZTwva2V5PgoJCTxkaWN0PgoJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQu
-	Y3JlYXRvcjwva2V5PgoJCQk8c3RyaW5nPmNvbS5hcHBsZS5qb2J0aWNrZXQ8L3N0cmlu
-	Zz4KCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0Lml0ZW1BcnJheTwva2V5PgoJ
-	CQk8YXJyYXk+CgkJCQk8ZGljdD4KCQkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC5QYXBl
-	ckluZm8uUE1QYXBlck5hbWU8L2tleT4KCQkJCQk8c3RyaW5nPmlzby1hNDwvc3RyaW5n
-	PgoJCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5zdGF0ZUZsYWc8L2tleT4K
-	CQkJCQk8aW50ZWdlcj4wPC9pbnRlZ2VyPgoJCQkJPC9kaWN0PgoJCQk8L2FycmF5PgoJ
-	CTwvZGljdD4KCQk8a2V5PmNvbS5hcHBsZS5wcmludC5QYXBlckluZm8uUE1VbmFkanVz
-	dGVkUGFnZVJlY3Q8L2tleT4KCQk8ZGljdD4KCQkJPGtleT5jb20uYXBwbGUucHJpbnQu
-	dGlja2V0LmNyZWF0b3I8L2tleT4KCQkJPHN0cmluZz5jb20uYXBwbGUuam9idGlja2V0
-	PC9zdHJpbmc+CgkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5pdGVtQXJyYXk8
-	L2tleT4KCQkJPGFycmF5PgoJCQkJPGRpY3Q+CgkJCQkJPGtleT5jb20uYXBwbGUucHJp
-	bnQuUGFwZXJJbmZvLlBNVW5hZGp1c3RlZFBhZ2VSZWN0PC9rZXk+CgkJCQkJPGFycmF5
-	PgoJCQkJCQk8cmVhbD4wLjA8L3JlYWw+CgkJCQkJCTxyZWFsPjAuMDwvcmVhbD4KCQkJ
-	CQkJPHJlYWw+NzgzPC9yZWFsPgoJCQkJCQk8cmVhbD41NTk8L3JlYWw+CgkJCQkJPC9h
-	cnJheT4KCQkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuc3RhdGVGbGFnPC9r
-	ZXk+CgkJCQkJPGludGVnZXI+MDwvaW50ZWdlcj4KCQkJCTwvZGljdD4KCQkJPC9hcnJh
-	eT4KCQk8L2RpY3Q+CgkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFwZXJJbmZvLlBNVW5h
-	ZGp1c3RlZFBhcGVyUmVjdDwva2V5PgoJCTxkaWN0PgoJCQk8a2V5PmNvbS5hcHBsZS5w
-	cmludC50aWNrZXQuY3JlYXRvcjwva2V5PgoJCQk8c3RyaW5nPmNvbS5hcHBsZS5qb2J0
-	aWNrZXQ8L3N0cmluZz4KCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0Lml0ZW1B
-	cnJheTwva2V5PgoJCQk8YXJyYXk+CgkJCQk8ZGljdD4KCQkJCQk8a2V5PmNvbS5hcHBs
-	ZS5wcmludC5QYXBlckluZm8uUE1VbmFkanVzdGVkUGFwZXJSZWN0PC9rZXk+CgkJCQkJ
-	PGFycmF5PgoJCQkJCQk8cmVhbD4tMTg8L3JlYWw+CgkJCQkJCTxyZWFsPi0xODwvcmVh
-	bD4KCQkJCQkJPHJlYWw+ODI0PC9yZWFsPgoJCQkJCQk8cmVhbD41Nzc8L3JlYWw+CgkJ
-	CQkJPC9hcnJheT4KCQkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuc3RhdGVG
-	bGFnPC9rZXk+CgkJCQkJPGludGVnZXI+MDwvaW50ZWdlcj4KCQkJCTwvZGljdD4KCQkJ
-	PC9hcnJheT4KCQk8L2RpY3Q+CgkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFwZXJJbmZv
-	LnBwZC5QTVBhcGVyTmFtZTwva2V5PgoJCTxkaWN0PgoJCQk8a2V5PmNvbS5hcHBsZS5w
-	cmludC50aWNrZXQuY3JlYXRvcjwva2V5PgoJCQk8c3RyaW5nPmNvbS5hcHBsZS5qb2J0
-	aWNrZXQ8L3N0cmluZz4KCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0Lml0ZW1B
-	cnJheTwva2V5PgoJCQk8YXJyYXk+CgkJCQk8ZGljdD4KCQkJCQk8a2V5PmNvbS5hcHBs
-	ZS5wcmludC5QYXBlckluZm8ucHBkLlBNUGFwZXJOYW1lPC9rZXk+CgkJCQkJPHN0cmlu
-	Zz5BNDwvc3RyaW5nPgoJCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5zdGF0
-	ZUZsYWc8L2tleT4KCQkJCQk8aW50ZWdlcj4wPC9pbnRlZ2VyPgoJCQkJPC9kaWN0PgoJ
-	CQk8L2FycmF5PgoJCTwvZGljdD4KCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQu
-	QVBJVmVyc2lvbjwva2V5PgoJCTxzdHJpbmc+MDAuMjA8L3N0cmluZz4KCQk8a2V5PmNv
-	bS5hcHBsZS5wcmludC50aWNrZXQudHlwZTwva2V5PgoJCTxzdHJpbmc+Y29tLmFwcGxl
-	LnByaW50LlBhcGVySW5mb1RpY2tldDwvc3RyaW5nPgoJPC9kaWN0PgoJPGtleT5jb20u
-	YXBwbGUucHJpbnQudGlja2V0LkFQSVZlcnNpb248L2tleT4KCTxzdHJpbmc+MDAuMjA8
-	L3N0cmluZz4KCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC50eXBlPC9rZXk+Cgk8
-	c3RyaW5nPmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0VGlja2V0PC9zdHJpbmc+Cjwv
-	ZGljdD4KPC9wbGlzdD4KhpKEmZkNTlNSaWdodE1hcmdpboaShKGbrZ4AhpKEmZkWTlNI
-	b3Jpem9udGFsbHlDZW50ZXJlZIaSpJKEmZkVTlNIb3Jpem9uYWxQYWdpbmF0aW9uhpKg
-	koSZmQ1OU0pvYkZlYXR1cmVzhpKElpcAhpKEmZkMTlNMZWZ0TWFyZ2luhpKEoZutngCG
-	koSZmQtOU1RvcE1hcmdpboaShKGbrZ4AhpKEmZkSTlNSZXZlcnNlUGFnZU9yZGVyhpKg
-	koSZmQ5OU0JvdHRvbU1hcmdpboaShKGbrZ4AhpKEmZkKTlNMYXN0UGFnZYaShKGbopeC
-	f////4aShJmZC05TRmlyc3RQYWdlhpKkkoSZmQ1OU09yaWVudGF0aW9uhpKghoY=
-	</data>
+	<key>PrintInfo</key>
+	<dict>
+		<key>NSBottomMargin</key>
+		<array>
+			<string>float</string>
+			<string>18</string>
+		</array>
+		<key>NSHorizonalPagination</key>
+		<array>
+			<string>int</string>
+			<string>0</string>
+		</array>
+		<key>NSJobFeatures</key>
+		<array>
+			<string>coded</string>
+			<string>BAtzdHJlYW10eXBlZIHoA4QBQISEhBNOU011dGFibGVEaWN0aW9uYXJ5AISEDE5TRGljdGlvbmFyeQCEhAhOU09iamVjdACFhAFpAIY=</string>
+		</array>
+		<key>NSLeftMargin</key>
+		<array>
+			<string>float</string>
+			<string>18</string>
+		</array>
+		<key>NSPagesPerSheet</key>
+		<array>
+			<string>int</string>
+			<string>1</string>
+		</array>
+		<key>NSPaperSize</key>
+		<array>
+			<string>size</string>
+			<string>{595, 842}</string>
+		</array>
+		<key>NSPrintAllPages</key>
+		<array>
+			<string>int</string>
+			<string>0</string>
+		</array>
+		<key>NSPrintReverseOrientation</key>
+		<array>
+			<string>int</string>
+			<string>0</string>
+		</array>
+		<key>NSReversePageOrder</key>
+		<array>
+			<string>int</string>
+			<string>0</string>
+		</array>
+		<key>NSRightMargin</key>
+		<array>
+			<string>float</string>
+			<string>18</string>
+		</array>
+		<key>NSTopMargin</key>
+		<array>
+			<string>float</string>
+			<string>41</string>
+		</array>
+	</dict>
+	<key>PrintOnePage</key>
+	<false/>
 	<key>ReadOnly</key>
 	<string>NO</string>
 	<key>RowAlign</key>
@@ -615,24 +876,42 @@
 	<string>YES</string>
 	<key>SmartDistanceGuidesActive</key>
 	<string>YES</string>
+	<key>UniqueID</key>
+	<integer>1</integer>
 	<key>UseEntirePage</key>
 	<true/>
 	<key>VPages</key>
 	<integer>1</integer>
 	<key>WindowInfo</key>
 	<dict>
 		<key>CurrentSheet</key>
-		<string>0</string>
+		<integer>0</integer>
+		<key>ExpandedCanvases</key>
+		<array/>
 		<key>Frame</key>
-		<string>{{522, 232}, {537, 755}}</string>
-		<key>ShowRuler</key>
+		<string>{{522, 231}, {675, 756}}</string>
+		<key>ListView</key>
 		<false/>
-		<key>ShowStatusBar</key>
+		<key>OutlineWidth</key>
+		<integer>142</integer>
+		<key>RightSidebar</key>
+		<false/>
+		<key>Sidebar</key>
 		<true/>
+		<key>SidebarWidth</key>
+		<integer>138</integer>
 		<key>VisibleRegion</key>
-		<string>{{0, 3}, {522, 657}}</string>
+		<string>{{1, 1}, {537, 662}}</string>
 		<key>Zoom</key>
-		<string>1</string>
+		<real>1</real>
+		<key>ZoomValues</key>
+		<array>
+			<array>
+				<string>Canvas 1</string>
+				<real>1</real>
+				<real>1</real>
+			</array>
+		</array>
 	</dict>
 </dict>
 </plist>
Index: doc/next-tutorial/object-class-appclass.png
===================================================================
diff -u -re1a3b4786ffd146bbc52f4ac2276df3f9bc9122e -rd00b7a9fa608e137faea6e52ded881b871d5c29e
Binary files differ
Index: doc/next-tutorial/object-stack.graffle
===================================================================
diff -u -re1a3b4786ffd146bbc52f4ac2276df3f9bc9122e -rd00b7a9fa608e137faea6e52ded881b871d5c29e
--- doc/next-tutorial/object-stack.graffle	(.../object-stack.graffle)	(revision e1a3b4786ffd146bbc52f4ac2276df3f9bc9122e)
+++ doc/next-tutorial/object-stack.graffle	(.../object-stack.graffle)	(revision d00b7a9fa608e137faea6e52ded881b871d5c29e)
@@ -2,25 +2,96 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CanvasColor</key>
+	<key>ActiveLayerIndex</key>
+	<integer>0</integer>
+	<key>ApplicationVersion</key>
+	<array>
+		<string>com.omnigroup.OmniGrafflePro</string>
+		<string>139.7.0.167456</string>
+	</array>
+	<key>AutoAdjust</key>
+	<false/>
+	<key>BackgroundGraphic</key>
 	<dict>
-		<key>w</key>
-		<string>1</string>
+		<key>Bounds</key>
+		<string>{{0, 0}, {559, 783}}</string>
+		<key>Class</key>
+		<string>SolidGraphic</string>
+		<key>ID</key>
+		<integer>2</integer>
+		<key>Style</key>
+		<dict>
+			<key>shadow</key>
+			<dict>
+				<key>Draws</key>
+				<string>NO</string>
+			</dict>
+			<key>stroke</key>
+			<dict>
+				<key>Draws</key>
+				<string>NO</string>
+			</dict>
+		</dict>
 	</dict>
+	<key>BaseZoom</key>
+	<integer>0</integer>
+	<key>CanvasOrigin</key>
+	<string>{0, 0}</string>
 	<key>ColumnAlign</key>
 	<integer>1</integer>
 	<key>ColumnSpacing</key>
 	<real>36</real>
 	<key>CreationDate</key>
-	<string>2011-01-08 09:39:13 +0100</string>
+	<string>2011-01-08 08:39:13 +0000</string>
 	<key>Creator</key>
 	<string>Gustaf A. Neumann</string>
+	<key>DisplayScale</key>
+	<string>1.000 cm = 1.000 cm</string>
 	<key>GraphDocumentVersion</key>
-	<integer>4</integer>
+	<integer>8</integer>
 	<key>GraphicsList</key>
 	<array>
 		<dict>
+			<key>Bounds</key>
+			<string>{{279.50000375109323, 186.00000036830778}, {58.32952880859375, 24}}</string>
 			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>ID</key>
+			<integer>13</integer>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Align</key>
+				<integer>0</integer>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
+
+\f0\fs18 \cf0 instance of}</string>
+				<key>VerticalPad</key>
+				<integer>0</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>AllowLabelDrop</key>
+			<false/>
+			<key>Class</key>
 			<string>LineGraphic</string>
 			<key>Head</key>
 			<dict>
@@ -29,43 +100,20 @@
 			</dict>
 			<key>ID</key>
 			<integer>12</integer>
-			<key>Labels</key>
-			<array>
-				<dict>
-					<key>FixedWidth</key>
-					<real>58.32952880859375</real>
-					<key>Label</key>
-					<dict>
-						<key>Align</key>
-						<integer>0</integer>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-
-\f0\fs18 \cf0 instance of}</string>
-					</dict>
-					<key>LabelVisible</key>
-					<string>YES</string>
-					<key>Offset</key>
-					<real>0.0</real>
-					<key>Position</key>
-					<real>0.50699383020401001</real>
-				</dict>
-			</array>
 			<key>Points</key>
 			<array>
-				<string>{300.978, 138}</string>
+				<string>{307.23684210526318, 166}</string>
 				<string>{311, 179}</string>
-				<string>{302.135, 207.346}</string>
+				<string>{297.95348837209303, 230}</string>
 			</array>
 			<key>Style</key>
 			<dict>
 				<key>stroke</key>
 				<dict>
 					<key>HeadArrow</key>
 					<string>0</string>
+					<key>Legacy</key>
+					<true/>
 					<key>LineType</key>
 					<integer>1</integer>
 					<key>Pattern</key>
@@ -81,136 +129,276 @@
 			</dict>
 		</dict>
 		<dict>
-			<key>Bounds</key>
-			<string>{{221, 207.346}, {136, 84}}</string>
 			<key>Class</key>
-			<string>MultiTextGraphic</string>
-			<key>FitText</key>
-			<string>Vertical</string>
-			<key>Flow</key>
-			<string>Resize</string>
-			<key>ID</key>
-			<integer>11</integer>
-			<key>ListOrientation</key>
-			<string>Vertical</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>GradientAngle</key>
-					<real>304</real>
-					<key>GradientCenter</key>
-					<string>{-0.294118, -0.264706}</string>
-				</dict>
-			</dict>
-			<key>TextList</key>
+			<string>TableGroup</string>
+			<key>Graphics</key>
 			<array>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{221, 230}, {136, 14}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>14</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\b\fs24 \cf0 stack : nx::Object}</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{221, 244}, {136, 28}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>15</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\fs24 \cf0 things\
 }</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{221, 272}, {136, 28}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>16</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\fs24 \cf0 push\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-\cf0 pop\
-}</string>
+pop}</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 			</array>
-			<key>TextPlacement</key>
-			<integer>0</integer>
+			<key>GridH</key>
+			<array>
+				<integer>14</integer>
+				<integer>15</integer>
+				<integer>16</integer>
+				<array/>
+			</array>
+			<key>GroupConnect</key>
+			<string>YES</string>
+			<key>ID</key>
+			<integer>11</integer>
 		</dict>
 		<dict>
-			<key>Bounds</key>
-			<string>{{221, 40}, {136, 98}}</string>
 			<key>Class</key>
-			<string>MultiTextGraphic</string>
-			<key>FitText</key>
-			<string>Vertical</string>
-			<key>Flow</key>
-			<string>Resize</string>
-			<key>ID</key>
-			<integer>10</integer>
-			<key>ListOrientation</key>
-			<string>Vertical</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>GradientAngle</key>
-					<real>304</real>
-					<key>GradientCenter</key>
-					<string>{-0.294118, -0.264706}</string>
-				</dict>
-			</dict>
-			<key>TextList</key>
+			<string>TableGroup</string>
+			<key>Graphics</key>
 			<array>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{221, 40}, {136, 14}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>17</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\b\fs24 \cf0 nx::Object}</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{221, 54}, {136, 28}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>18</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\fs24 \cf0 \
 }</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{221, 82}, {136, 84}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>19</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\fs24 \cf0 info\
 destroy\
-method\
-...}</string>
+object method\
+object variable\
+...\
+}</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 			</array>
-			<key>TextPlacement</key>
-			<integer>0</integer>
+			<key>GridH</key>
+			<array>
+				<integer>17</integer>
+				<integer>18</integer>
+				<integer>19</integer>
+				<array/>
+			</array>
+			<key>GroupConnect</key>
+			<string>YES</string>
+			<key>ID</key>
+			<integer>10</integer>
 		</dict>
 	</array>
 	<key>GridInfo</key>
@@ -228,8 +416,8 @@
 	<integer>1</integer>
 	<key>ImageCounter</key>
 	<integer>1</integer>
-	<key>IsPalette</key>
-	<string>NO</string>
+	<key>KeepToScale</key>
+	<false/>
 	<key>Layers</key>
 	<array>
 		<dict>
@@ -245,146 +433,97 @@
 	</array>
 	<key>LayoutInfo</key>
 	<dict>
-		<key>ChildOrdering</key>
-		<integer>0</integer>
+		<key>Animate</key>
+		<string>NO</string>
+		<key>circoMinDist</key>
+		<real>18</real>
+		<key>circoSeparation</key>
+		<real>0.0</real>
+		<key>layoutEngine</key>
+		<string>dot</string>
+		<key>neatoSeparation</key>
+		<real>0.0</real>
+		<key>twopiSeparation</key>
+		<real>0.0</real>
 	</dict>
 	<key>LinksVisible</key>
 	<string>NO</string>
 	<key>MagnetsVisible</key>
 	<string>NO</string>
+	<key>MasterSheets</key>
+	<array/>
 	<key>ModificationDate</key>
-	<string>2011-01-08 18:40:19 +0100</string>
+	<string>2013-05-04 13:21:45 +0000</string>
 	<key>Modifier</key>
 	<string>Gustaf A. Neumann</string>
+	<key>NotesVisible</key>
+	<string>NO</string>
 	<key>Orientation</key>
 	<integer>2</integer>
+	<key>OriginVisible</key>
+	<string>NO</string>
 	<key>PageBreaks</key>
 	<string>YES</string>
-	<key>PageSetup</key>
-	<data>
-	BAt0eXBlZHN0cmVhbYED6IQBQISEhAtOU1ByaW50SW5mbwGEhAhOU09iamVjdACFkoSE
-	hBNOU011dGFibGVEaWN0aW9uYXJ5AISEDE5TRGljdGlvbmFyeQCUhAFpFpKEhIQITlNT
-	dHJpbmcBlIQBKxBOU0pvYkRpc3Bvc2l0aW9uhpKEmZkPTlNQcmludFNwb29sSm9ihpKE
-	mZkLTlNQYXBlclNpemWGkoSEhAdOU1ZhbHVlAJSEASqEhAx7X05TU2l6ZT1mZn2cgQJT
-	gQNKhpKEmZkUTlNWZXJ0aWNhbFBhZ2luYXRpb26GkoSEhAhOU051bWJlcgCdm4SXlwCG
-	koSZmQ9OU1BhZ2VzUGVyU2hlZXSGkoShm6KXAYaShJmZFE5TVmVydGljYWxseUNlbnRl
-	cmVkhpKkkoSZmRlOU1ByaW50UmV2ZXJzZU9yaWVudGF0aW9uhpKgkoSZmQ9OU1ByaW50
-	QWxsUGFnZXOGkqCShJmZC05TUGFwZXJOYW1lhpKEmZkGaXNvLWE0hpKEmZkITlNDb3Bp
-	ZXOGkqSShJmZD05TU2NhbGluZ0ZhY3RvcoaShKGbhIQBZJ4BhpKEmZkOTlNQTVBhZ2VG
-	b3JtYXSGkoSEhA1OU011dGFibGVEYXRhAISEBk5TRGF0YQCUl4EVL4QHWzU0MjNjXTw/
-	eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04Ij8+CjwhRE9DVFlQRSBwbGlz
-	dCBQVUJMSUMgIi0vL0FwcGxlLy9EVEQgUExJU1QgMS4wLy9FTiIgImh0dHA6Ly93d3cu
-	YXBwbGUuY29tL0RURHMvUHJvcGVydHlMaXN0LTEuMC5kdGQiPgo8cGxpc3QgdmVyc2lv
-	bj0iMS4wIj4KPGRpY3Q+Cgk8a2V5PmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0LlBN
-	SG9yaXpvbnRhbFJlczwva2V5PgoJPGRpY3Q+CgkJPGtleT5jb20uYXBwbGUucHJpbnQu
-	dGlja2V0LmNyZWF0b3I8L2tleT4KCQk8c3RyaW5nPmNvbS5hcHBsZS5qb2J0aWNrZXQ8
-	L3N0cmluZz4KCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuaXRlbUFycmF5PC9r
-	ZXk+CgkJPGFycmF5PgoJCQk8ZGljdD4KCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LlBh
-	Z2VGb3JtYXQuUE1Ib3Jpem9udGFsUmVzPC9rZXk+CgkJCQk8cmVhbD43MjwvcmVhbD4K
-	CQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5zdGF0ZUZsYWc8L2tleT4KCQkJ
-	CTxpbnRlZ2VyPjA8L2ludGVnZXI+CgkJCTwvZGljdD4KCQk8L2FycmF5PgoJPC9kaWN0
-	PgoJPGtleT5jb20uYXBwbGUucHJpbnQuUGFnZUZvcm1hdC5QTU9yaWVudGF0aW9uPC9r
-	ZXk+Cgk8ZGljdD4KCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuY3JlYXRvcjwv
-	a2V5PgoJCTxzdHJpbmc+Y29tLmFwcGxlLmpvYnRpY2tldDwvc3RyaW5nPgoJCTxrZXk+
-	Y29tLmFwcGxlLnByaW50LnRpY2tldC5pdGVtQXJyYXk8L2tleT4KCQk8YXJyYXk+CgkJ
-	CTxkaWN0PgoJCQkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFnZUZvcm1hdC5QTU9yaWVu
-	dGF0aW9uPC9rZXk+CgkJCQk8aW50ZWdlcj4xPC9pbnRlZ2VyPgoJCQkJPGtleT5jb20u
-	YXBwbGUucHJpbnQudGlja2V0LnN0YXRlRmxhZzwva2V5PgoJCQkJPGludGVnZXI+MDwv
-	aW50ZWdlcj4KCQkJPC9kaWN0PgoJCTwvYXJyYXk+Cgk8L2RpY3Q+Cgk8a2V5PmNvbS5h
-	cHBsZS5wcmludC5QYWdlRm9ybWF0LlBNU2NhbGluZzwva2V5PgoJPGRpY3Q+CgkJPGtl
-	eT5jb20uYXBwbGUucHJpbnQudGlja2V0LmNyZWF0b3I8L2tleT4KCQk8c3RyaW5nPmNv
-	bS5hcHBsZS5qb2J0aWNrZXQ8L3N0cmluZz4KCQk8a2V5PmNvbS5hcHBsZS5wcmludC50
-	aWNrZXQuaXRlbUFycmF5PC9rZXk+CgkJPGFycmF5PgoJCQk8ZGljdD4KCQkJCTxrZXk+
-	Y29tLmFwcGxlLnByaW50LlBhZ2VGb3JtYXQuUE1TY2FsaW5nPC9rZXk+CgkJCQk8cmVh
-	bD4xPC9yZWFsPgoJCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0LnN0YXRlRmxh
-	Zzwva2V5PgoJCQkJPGludGVnZXI+MDwvaW50ZWdlcj4KCQkJPC9kaWN0PgoJCTwvYXJy
-	YXk+Cgk8L2RpY3Q+Cgk8a2V5PmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0LlBNVmVy
-	dGljYWxSZXM8L2tleT4KCTxkaWN0PgoJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tl
-	dC5jcmVhdG9yPC9rZXk+CgkJPHN0cmluZz5jb20uYXBwbGUuam9idGlja2V0PC9zdHJp
-	bmc+CgkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0Lml0ZW1BcnJheTwva2V5PgoJ
-	CTxhcnJheT4KCQkJPGRpY3Q+CgkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC5QYWdlRm9y
-	bWF0LlBNVmVydGljYWxSZXM8L2tleT4KCQkJCTxyZWFsPjcyPC9yZWFsPgoJCQkJPGtl
-	eT5jb20uYXBwbGUucHJpbnQudGlja2V0LnN0YXRlRmxhZzwva2V5PgoJCQkJPGludGVn
-	ZXI+MDwvaW50ZWdlcj4KCQkJPC9kaWN0PgoJCTwvYXJyYXk+Cgk8L2RpY3Q+Cgk8a2V5
-	PmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0LlBNVmVydGljYWxTY2FsaW5nPC9rZXk+
-	Cgk8ZGljdD4KCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuY3JlYXRvcjwva2V5
-	PgoJCTxzdHJpbmc+Y29tLmFwcGxlLmpvYnRpY2tldDwvc3RyaW5nPgoJCTxrZXk+Y29t
-	LmFwcGxlLnByaW50LnRpY2tldC5pdGVtQXJyYXk8L2tleT4KCQk8YXJyYXk+CgkJCTxk
-	aWN0PgoJCQkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFnZUZvcm1hdC5QTVZlcnRpY2Fs
-	U2NhbGluZzwva2V5PgoJCQkJPHJlYWw+MTwvcmVhbD4KCQkJCTxrZXk+Y29tLmFwcGxl
-	LnByaW50LnRpY2tldC5zdGF0ZUZsYWc8L2tleT4KCQkJCTxpbnRlZ2VyPjA8L2ludGVn
-	ZXI+CgkJCTwvZGljdD4KCQk8L2FycmF5PgoJPC9kaWN0PgoJPGtleT5jb20uYXBwbGUu
-	cHJpbnQuc3ViVGlja2V0LnBhcGVyX2luZm9fdGlja2V0PC9rZXk+Cgk8ZGljdD4KCQk8
-	a2V5PmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0LlBNQWRqdXN0ZWRQYWdlUmVjdDwv
-	a2V5PgoJCTxkaWN0PgoJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuY3JlYXRv
-	cjwva2V5PgoJCQk8c3RyaW5nPmNvbS5hcHBsZS5qb2J0aWNrZXQ8L3N0cmluZz4KCQkJ
-	PGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0Lml0ZW1BcnJheTwva2V5PgoJCQk8YXJy
-	YXk+CgkJCQk8ZGljdD4KCQkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0
-	LlBNQWRqdXN0ZWRQYWdlUmVjdDwva2V5PgoJCQkJCTxhcnJheT4KCQkJCQkJPGludGVn
-	ZXI+MDwvaW50ZWdlcj4KCQkJCQkJPGludGVnZXI+MDwvaW50ZWdlcj4KCQkJCQkJPHJl
-	YWw+NzgzPC9yZWFsPgoJCQkJCQk8cmVhbD41NTk8L3JlYWw+CgkJCQkJPC9hcnJheT4K
-	CQkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuc3RhdGVGbGFnPC9rZXk+CgkJ
-	CQkJPGludGVnZXI+MDwvaW50ZWdlcj4KCQkJCTwvZGljdD4KCQkJPC9hcnJheT4KCQk8
-	L2RpY3Q+CgkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFnZUZvcm1hdC5QTUFkanVzdGVk
-	UGFwZXJSZWN0PC9rZXk+CgkJPGRpY3Q+CgkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRp
-	Y2tldC5jcmVhdG9yPC9rZXk+CgkJCTxzdHJpbmc+Y29tLmFwcGxlLmpvYnRpY2tldDwv
-	c3RyaW5nPgoJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuaXRlbUFycmF5PC9r
-	ZXk+CgkJCTxhcnJheT4KCQkJCTxkaWN0PgoJCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50
-	LlBhZ2VGb3JtYXQuUE1BZGp1c3RlZFBhcGVyUmVjdDwva2V5PgoJCQkJCTxhcnJheT4K
-	CQkJCQkJPHJlYWw+LTE4PC9yZWFsPgoJCQkJCQk8cmVhbD4tMTg8L3JlYWw+CgkJCQkJ
-	CTxyZWFsPjgyNDwvcmVhbD4KCQkJCQkJPHJlYWw+NTc3PC9yZWFsPgoJCQkJCTwvYXJy
-	YXk+CgkJCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0LnN0YXRlRmxhZzwva2V5
-	PgoJCQkJCTxpbnRlZ2VyPjA8L2ludGVnZXI+CgkJCQk8L2RpY3Q+CgkJCTwvYXJyYXk+
-	CgkJPC9kaWN0PgoJCTxrZXk+Y29tLmFwcGxlLnByaW50LlBhcGVySW5mby5QTVBhcGVy
-	TmFtZTwva2V5PgoJCTxkaWN0PgoJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQu
-	Y3JlYXRvcjwva2V5PgoJCQk8c3RyaW5nPmNvbS5hcHBsZS5qb2J0aWNrZXQ8L3N0cmlu
-	Zz4KCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0Lml0ZW1BcnJheTwva2V5PgoJ
-	CQk8YXJyYXk+CgkJCQk8ZGljdD4KCQkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC5QYXBl
-	ckluZm8uUE1QYXBlck5hbWU8L2tleT4KCQkJCQk8c3RyaW5nPmlzby1hNDwvc3RyaW5n
-	PgoJCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5zdGF0ZUZsYWc8L2tleT4K
-	CQkJCQk8aW50ZWdlcj4wPC9pbnRlZ2VyPgoJCQkJPC9kaWN0PgoJCQk8L2FycmF5PgoJ
-	CTwvZGljdD4KCQk8a2V5PmNvbS5hcHBsZS5wcmludC5QYXBlckluZm8uUE1VbmFkanVz
-	dGVkUGFnZVJlY3Q8L2tleT4KCQk8ZGljdD4KCQkJPGtleT5jb20uYXBwbGUucHJpbnQu
-	dGlja2V0LmNyZWF0b3I8L2tleT4KCQkJPHN0cmluZz5jb20uYXBwbGUuam9idGlja2V0
-	PC9zdHJpbmc+CgkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5pdGVtQXJyYXk8
-	L2tleT4KCQkJPGFycmF5PgoJCQkJPGRpY3Q+CgkJCQkJPGtleT5jb20uYXBwbGUucHJp
-	bnQuUGFwZXJJbmZvLlBNVW5hZGp1c3RlZFBhZ2VSZWN0PC9rZXk+CgkJCQkJPGFycmF5
-	PgoJCQkJCQk8cmVhbD4wLjA8L3JlYWw+CgkJCQkJCTxyZWFsPjAuMDwvcmVhbD4KCQkJ
-	CQkJPHJlYWw+NzgzPC9yZWFsPgoJCQkJCQk8cmVhbD41NTk8L3JlYWw+CgkJCQkJPC9h
-	cnJheT4KCQkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuc3RhdGVGbGFnPC9r
-	ZXk+CgkJCQkJPGludGVnZXI+MDwvaW50ZWdlcj4KCQkJCTwvZGljdD4KCQkJPC9hcnJh
-	eT4KCQk8L2RpY3Q+CgkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFwZXJJbmZvLlBNVW5h
-	ZGp1c3RlZFBhcGVyUmVjdDwva2V5PgoJCTxkaWN0PgoJCQk8a2V5PmNvbS5hcHBsZS5w
-	cmludC50aWNrZXQuY3JlYXRvcjwva2V5PgoJCQk8c3RyaW5nPmNvbS5hcHBsZS5qb2J0
-	aWNrZXQ8L3N0cmluZz4KCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0Lml0ZW1B
-	cnJheTwva2V5PgoJCQk8YXJyYXk+CgkJCQk8ZGljdD4KCQkJCQk8a2V5PmNvbS5hcHBs
-	ZS5wcmludC5QYXBlckluZm8uUE1VbmFkanVzdGVkUGFwZXJSZWN0PC9rZXk+CgkJCQkJ
-	PGFycmF5PgoJCQkJCQk8cmVhbD4tMTg8L3JlYWw+CgkJCQkJCTxyZWFsPi0xODwvcmVh
-	bD4KCQkJCQkJPHJlYWw+ODI0PC9yZWFsPgoJCQkJCQk8cmVhbD41Nzc8L3JlYWw+CgkJ
-	CQkJPC9hcnJheT4KCQkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuc3RhdGVG
-	bGFnPC9rZXk+CgkJCQkJPGludGVnZXI+MDwvaW50ZWdlcj4KCQkJCTwvZGljdD4KCQkJ
-	PC9hcnJheT4KCQk8L2RpY3Q+CgkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFwZXJJbmZv
-	LnBwZC5QTVBhcGVyTmFtZTwva2V5PgoJCTxkaWN0PgoJCQk8a2V5PmNvbS5hcHBsZS5w
-	cmludC50aWNrZXQuY3JlYXRvcjwva2V5PgoJCQk8c3RyaW5nPmNvbS5hcHBsZS5qb2J0
-	aWNrZXQ8L3N0cmluZz4KCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0Lml0ZW1B
-	cnJheTwva2V5PgoJCQk8YXJyYXk+CgkJCQk8ZGljdD4KCQkJCQk8a2V5PmNvbS5hcHBs
-	ZS5wcmludC5QYXBlckluZm8ucHBkLlBNUGFwZXJOYW1lPC9rZXk+CgkJCQkJPHN0cmlu
-	Zz5BNDwvc3RyaW5nPgoJCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5zdGF0
-	ZUZsYWc8L2tleT4KCQkJCQk8aW50ZWdlcj4wPC9pbnRlZ2VyPgoJCQkJPC9kaWN0PgoJ
-	CQk8L2FycmF5PgoJCTwvZGljdD4KCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQu
-	QVBJVmVyc2lvbjwva2V5PgoJCTxzdHJpbmc+MDAuMjA8L3N0cmluZz4KCQk8a2V5PmNv
-	bS5hcHBsZS5wcmludC50aWNrZXQudHlwZTwva2V5PgoJCTxzdHJpbmc+Y29tLmFwcGxl
-	LnByaW50LlBhcGVySW5mb1RpY2tldDwvc3RyaW5nPgoJPC9kaWN0PgoJPGtleT5jb20u
-	YXBwbGUucHJpbnQudGlja2V0LkFQSVZlcnNpb248L2tleT4KCTxzdHJpbmc+MDAuMjA8
-	L3N0cmluZz4KCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC50eXBlPC9rZXk+Cgk8
-	c3RyaW5nPmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0VGlja2V0PC9zdHJpbmc+Cjwv
-	ZGljdD4KPC9wbGlzdD4KhpKEmZkNTlNSaWdodE1hcmdpboaShKGbrZ4AhpKEmZkWTlNI
-	b3Jpem9udGFsbHlDZW50ZXJlZIaSpJKEmZkVTlNIb3Jpem9uYWxQYWdpbmF0aW9uhpKg
-	koSZmQ1OU0pvYkZlYXR1cmVzhpKElpcAhpKEmZkMTlNMZWZ0TWFyZ2luhpKEoZutngCG
-	koSZmQtOU1RvcE1hcmdpboaShKGbrZ4AhpKEmZkSTlNSZXZlcnNlUGFnZU9yZGVyhpKg
-	koSZmQ5OU0JvdHRvbU1hcmdpboaShKGbrZ4AhpKEmZkKTlNMYXN0UGFnZYaShKGbopeC
-	f////4aShJmZC05TRmlyc3RQYWdlhpKkkoSZmQ1OU09yaWVudGF0aW9uhpKghoY=
-	</data>
+	<key>PrintInfo</key>
+	<dict>
+		<key>NSBottomMargin</key>
+		<array>
+			<string>float</string>
+			<string>18</string>
+		</array>
+		<key>NSHorizonalPagination</key>
+		<array>
+			<string>int</string>
+			<string>0</string>
+		</array>
+		<key>NSJobFeatures</key>
+		<array>
+			<string>coded</string>
+			<string>BAtzdHJlYW10eXBlZIHoA4QBQISEhBNOU011dGFibGVEaWN0aW9uYXJ5AISEDE5TRGljdGlvbmFyeQCEhAhOU09iamVjdACFhAFpAIY=</string>
+		</array>
+		<key>NSLeftMargin</key>
+		<array>
+			<string>float</string>
+			<string>18</string>
+		</array>
+		<key>NSPagesPerSheet</key>
+		<array>
+			<string>int</string>
+			<string>1</string>
+		</array>
+		<key>NSPaperSize</key>
+		<array>
+			<string>size</string>
+			<string>{595, 842}</string>
+		</array>
+		<key>NSPrintAllPages</key>
+		<array>
+			<string>int</string>
+			<string>0</string>
+		</array>
+		<key>NSPrintReverseOrientation</key>
+		<array>
+			<string>int</string>
+			<string>0</string>
+		</array>
+		<key>NSReversePageOrder</key>
+		<array>
+			<string>int</string>
+			<string>0</string>
+		</array>
+		<key>NSRightMargin</key>
+		<array>
+			<string>float</string>
+			<string>18</string>
+		</array>
+		<key>NSTopMargin</key>
+		<array>
+			<string>float</string>
+			<string>41</string>
+		</array>
+	</dict>
+	<key>PrintOnePage</key>
+	<false/>
 	<key>ReadOnly</key>
 	<string>NO</string>
 	<key>RowAlign</key>
@@ -397,24 +536,42 @@
 	<string>YES</string>
 	<key>SmartDistanceGuidesActive</key>
 	<string>YES</string>
+	<key>UniqueID</key>
+	<integer>1</integer>
 	<key>UseEntirePage</key>
 	<true/>
 	<key>VPages</key>
 	<integer>1</integer>
 	<key>WindowInfo</key>
 	<dict>
 		<key>CurrentSheet</key>
-		<string>0</string>
+		<integer>0</integer>
+		<key>ExpandedCanvases</key>
+		<array/>
 		<key>Frame</key>
 		<string>{{118, 346}, {574, 881}}</string>
-		<key>ShowRuler</key>
+		<key>ListView</key>
 		<false/>
-		<key>ShowStatusBar</key>
+		<key>OutlineWidth</key>
+		<integer>142</integer>
+		<key>RightSidebar</key>
+		<false/>
+		<key>Sidebar</key>
 		<true/>
+		<key>SidebarWidth</key>
+		<integer>138</integer>
 		<key>VisibleRegion</key>
-		<string>{{0, 0}, {559, 783}}</string>
+		<string>{{1, -1}, {436, 787}}</string>
 		<key>Zoom</key>
-		<string>1</string>
+		<real>1</real>
+		<key>ZoomValues</key>
+		<array>
+			<array>
+				<string>Canvas 1</string>
+				<real>1</real>
+				<real>1</real>
+			</array>
+		</array>
 	</dict>
 </dict>
 </plist>
Index: doc/next-tutorial/object-stack.png
===================================================================
diff -u -re1a3b4786ffd146bbc52f4ac2276df3f9bc9122e -rd00b7a9fa608e137faea6e52ded881b871d5c29e
Binary files differ
Index: doc/next-tutorial/per-class-mixin.graffle
===================================================================
diff -u -re1a3b4786ffd146bbc52f4ac2276df3f9bc9122e -rd00b7a9fa608e137faea6e52ded881b871d5c29e
--- doc/next-tutorial/per-class-mixin.graffle	(.../per-class-mixin.graffle)	(revision e1a3b4786ffd146bbc52f4ac2276df3f9bc9122e)
+++ doc/next-tutorial/per-class-mixin.graffle	(.../per-class-mixin.graffle)	(revision d00b7a9fa608e137faea6e52ded881b871d5c29e)
@@ -2,36 +2,70 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CanvasColor</key>
+	<key>ActiveLayerIndex</key>
+	<integer>0</integer>
+	<key>ApplicationVersion</key>
+	<array>
+		<string>com.omnigroup.OmniGrafflePro</string>
+		<string>139.7.0.167456</string>
+	</array>
+	<key>AutoAdjust</key>
+	<false/>
+	<key>BackgroundGraphic</key>
 	<dict>
-		<key>w</key>
-		<string>1</string>
+		<key>Bounds</key>
+		<string>{{0, 0}, {559, 783}}</string>
+		<key>Class</key>
+		<string>SolidGraphic</string>
+		<key>ID</key>
+		<integer>2</integer>
+		<key>Style</key>
+		<dict>
+			<key>shadow</key>
+			<dict>
+				<key>Draws</key>
+				<string>NO</string>
+			</dict>
+			<key>stroke</key>
+			<dict>
+				<key>Draws</key>
+				<string>NO</string>
+			</dict>
+		</dict>
 	</dict>
+	<key>BaseZoom</key>
+	<integer>0</integer>
+	<key>CanvasOrigin</key>
+	<string>{0, 0}</string>
 	<key>ColumnAlign</key>
 	<integer>1</integer>
 	<key>ColumnSpacing</key>
 	<real>36</real>
 	<key>CreationDate</key>
-	<string>2009-12-29 16:06:59 +0100</string>
+	<string>2009-12-29 15:06:59 +0000</string>
 	<key>Creator</key>
 	<string>Gustaf A. Neumann</string>
+	<key>DisplayScale</key>
+	<string>1.000 cm = 1.000 cm</string>
 	<key>GraphDocumentVersion</key>
-	<integer>4</integer>
+	<integer>8</integer>
 	<key>GraphicsList</key>
 	<array>
 		<dict>
+			<key>AllowLabelDrop</key>
+			<false/>
 			<key>Class</key>
 			<string>LineGraphic</string>
 			<key>Head</key>
 			<dict>
 				<key>ID</key>
-				<integer>2</integer>
+				<integer>19</integer>
 			</dict>
 			<key>ID</key>
 			<integer>10</integer>
 			<key>Points</key>
 			<array>
-				<string>{362.173, 304.106}</string>
+				<string>{362.173, 304.10599999999999}</string>
 				<string>{362.173, 274.053}</string>
 			</array>
 			<key>Style</key>
@@ -40,6 +74,8 @@
 				<dict>
 					<key>HeadArrow</key>
 					<string>UMLInheritance</string>
+					<key>Legacy</key>
+					<true/>
 					<key>LineType</key>
 					<integer>1</integer>
 					<key>TailArrow</key>
@@ -53,55 +89,173 @@
 			</dict>
 		</dict>
 		<dict>
-			<key>Bounds</key>
-			<string>{{294.173, 304.106}, {136, 38}}</string>
 			<key>Class</key>
-			<string>MultiTextGraphic</string>
-			<key>FitText</key>
-			<string>Vertical</string>
-			<key>Flow</key>
-			<string>Resize</string>
-			<key>ID</key>
-			<integer>9</integer>
-			<key>ListOrientation</key>
-			<string>Vertical</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>GradientAngle</key>
-					<real>304</real>
-					<key>GradientCenter</key>
-					<string>{-0.294118, -0.264706}</string>
-				</dict>
-			</dict>
-			<key>TextList</key>
+			<string>TableGroup</string>
+			<key>Graphics</key>
 			<array>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{294.173, 304.10599999999999}, {136, 14}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>11</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\b\fs24 \cf0 SafeStack}</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 				<dict>
-					<key>Align</key>
+					<key>Bounds</key>
+					<string>{{294.173, 318.10599999999999}, {136, 12}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>12</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
+					<key>Text</key>
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
 					<integer>0</integer>
 				</dict>
 				<dict>
-					<key>Align</key>
+					<key>Bounds</key>
+					<string>{{294.173, 330.10599999999999}, {136, 12}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>13</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
+					<key>Text</key>
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
 					<integer>0</integer>
 				</dict>
 			</array>
-			<key>TextPlacement</key>
-			<integer>0</integer>
+			<key>GridH</key>
+			<array>
+				<integer>11</integer>
+				<integer>12</integer>
+				<integer>13</integer>
+				<array/>
+			</array>
+			<key>GroupConnect</key>
+			<string>YES</string>
+			<key>ID</key>
+			<integer>9</integer>
 		</dict>
 		<dict>
+			<key>Bounds</key>
+			<string>{{329.23142275820402, 358.31565478004751}, {75, 24}}</string>
 			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>ID</key>
+			<integer>14</integer>
+			<key>Line</key>
+			<dict>
+				<key>ID</key>
+				<integer>8</integer>
+				<key>Position</key>
+				<real>0.55582332611083984</real>
+				<key>RotationType</key>
+				<integer>0</integer>
+			</dict>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Align</key>
+				<integer>0</integer>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
+
+\f0\fs18 \cf0 instance of}</string>
+				<key>VerticalPad</key>
+				<integer>0</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>AllowLabelDrop</key>
+			<false/>
+			<key>Class</key>
 			<string>LineGraphic</string>
 			<key>Head</key>
 			<dict>
@@ -110,41 +264,20 @@
 			</dict>
 			<key>ID</key>
 			<integer>8</integer>
-			<key>Labels</key>
-			<array>
-				<dict>
-					<key>Label</key>
-					<dict>
-						<key>Align</key>
-						<integer>0</integer>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-
-\f0\fs18 \cf0 instance of}</string>
-					</dict>
-					<key>LabelVisible</key>
-					<string>YES</string>
-					<key>Offset</key>
-					<real>0.0</real>
-					<key>Position</key>
-					<real>0.55582332611083984</real>
-				</dict>
-			</array>
 			<key>Points</key>
 			<array>
-				<string>{363.844, 342.106}</string>
+				<string>{363.84399999999999, 342.10599999999999}</string>
 				<string>{367, 378}</string>
-				<string>{362.173, 387.692}</string>
+				<string>{362.173, 387.69200000000001}</string>
 			</array>
 			<key>Style</key>
 			<dict>
 				<key>stroke</key>
 				<dict>
 					<key>HeadArrow</key>
 					<string>0</string>
+					<key>Legacy</key>
+					<true/>
 					<key>LineType</key>
 					<integer>1</integer>
 					<key>Pattern</key>
@@ -161,7 +294,7 @@
 		</dict>
 		<dict>
 			<key>Bounds</key>
-			<string>{{317.173, 387.692}, {90, 36}}</string>
+			<string>{{317.173, 387.69200000000001}, {90, 36}}</string>
 			<key>Class</key>
 			<string>ShapedGraphic</string>
 			<key>ID</key>
@@ -175,19 +308,73 @@
 			</array>
 			<key>Shape</key>
 			<string>Rectangle</string>
+			<key>Style</key>
+			<dict/>
 			<key>Text</key>
 			<dict>
+				<key>Align</key>
+				<integer>0</integer>
 				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\b\fs24 \cf0 s3 : Stack}</string>
+				<key>VerticalPad</key>
+				<integer>0</integer>
 			</dict>
 		</dict>
 		<dict>
+			<key>Bounds</key>
+			<string>{{181.15389598293871, 297.47410116179435}, {72.10552978515625, 24}}</string>
 			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>ID</key>
+			<integer>15</integer>
+			<key>Line</key>
+			<dict>
+				<key>ID</key>
+				<integer>6</integer>
+				<key>Position</key>
+				<real>0.62633061408996582</real>
+				<key>RotationType</key>
+				<integer>0</integer>
+			</dict>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Align</key>
+				<integer>0</integer>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
+
+\f0\fs18 \cf0 per-class mixin}</string>
+				<key>VerticalPad</key>
+				<integer>0</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>AllowLabelDrop</key>
+			<false/>
+			<key>Class</key>
 			<string>LineGraphic</string>
 			<key>Head</key>
 			<dict>
@@ -196,43 +383,20 @@
 			</dict>
 			<key>ID</key>
 			<integer>6</integer>
-			<key>Labels</key>
-			<array>
-				<dict>
-					<key>FixedWidth</key>
-					<real>72.10552978515625</real>
-					<key>Label</key>
-					<dict>
-						<key>Align</key>
-						<integer>0</integer>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-
-\f0\fs18 \cf0 per-class mixin}</string>
-					</dict>
-					<key>LabelVisible</key>
-					<string>YES</string>
-					<key>Offset</key>
-					<real>0.0</real>
-					<key>Position</key>
-					<real>0.62633061408996582</real>
-				</dict>
-			</array>
 			<key>Points</key>
 			<array>
-				<string>{294.173, 319.941}</string>
+				<string>{294.173, 319.94065347289455}</string>
 				<string>{231, 317}</string>
-				<string>{180.733, 277.519}</string>
+				<string>{180.73288414687903, 277.51900000000001}</string>
 			</array>
 			<key>Style</key>
 			<dict>
 				<key>stroke</key>
 				<dict>
 					<key>HeadArrow</key>
 					<string>0</string>
+					<key>Legacy</key>
+					<true/>
 					<key>LineType</key>
 					<integer>1</integer>
 					<key>Pattern</key>
@@ -248,6 +412,8 @@
 			</dict>
 		</dict>
 		<dict>
+			<key>AllowLabelDrop</key>
+			<false/>
 			<key>Class</key>
 			<string>LineGraphic</string>
 			<key>Head</key>
@@ -259,15 +425,17 @@
 			<integer>5</integer>
 			<key>Points</key>
 			<array>
-				<string>{178.281, 179.519}</string>
-				<string>{229.065, 138}</string>
+				<string>{178.25987156357274, 179.51900000000001}</string>
+				<string>{229.0263150257764, 138}</string>
 			</array>
 			<key>Style</key>
 			<dict>
 				<key>stroke</key>
 				<dict>
 					<key>HeadArrow</key>
 					<string>UMLInheritance</string>
+					<key>Legacy</key>
+					<true/>
 					<key>LineType</key>
 					<integer>1</integer>
 					<key>TailArrow</key>
@@ -281,72 +449,144 @@
 			</dict>
 		</dict>
 		<dict>
-			<key>Bounds</key>
-			<string>{{50.3462, 179.519}, {136, 98}}</string>
 			<key>Class</key>
-			<string>MultiTextGraphic</string>
-			<key>FitText</key>
-			<string>Vertical</string>
-			<key>Flow</key>
-			<string>Resize</string>
-			<key>ID</key>
-			<integer>4</integer>
-			<key>ListOrientation</key>
-			<string>Vertical</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>GradientAngle</key>
-					<real>304</real>
-					<key>GradientCenter</key>
-					<string>{-0.294118, -0.264706}</string>
-				</dict>
-			</dict>
-			<key>TextList</key>
+			<string>TableGroup</string>
+			<key>Graphics</key>
 			<array>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{50.34620000000001, 179.51900000000001}, {136, 14}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>16</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\b\fs24 \cf0 Safety}</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{50.34620000000001, 193.51900000000001}, {136, 28}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>17</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\fs24 \cf0 \
 }</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{50.34620000000001, 221.51900000000001}, {136, 56}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>18</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\fs24 \cf0 init\
 push\
 pop\
 }</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 			</array>
-			<key>TextPlacement</key>
-			<integer>0</integer>
+			<key>GridH</key>
+			<array>
+				<integer>16</integer>
+				<integer>17</integer>
+				<integer>18</integer>
+				<array/>
+			</array>
+			<key>GroupConnect</key>
+			<string>YES</string>
+			<key>ID</key>
+			<integer>4</integer>
 		</dict>
 		<dict>
+			<key>AllowLabelDrop</key>
+			<false/>
 			<key>Class</key>
 			<string>LineGraphic</string>
 			<key>Head</key>
@@ -358,15 +598,17 @@
 			<integer>3</integer>
 			<key>Points</key>
 			<array>
-				<string>{335.819, 176.053}</string>
-				<string>{315.354, 138}</string>
+				<string>{335.8324339647437, 176.053}</string>
+				<string>{315.37656540679257, 138}</string>
 			</array>
 			<key>Style</key>
 			<dict>
 				<key>stroke</key>
 				<dict>
 					<key>HeadArrow</key>
 					<string>UMLInheritance</string>
+					<key>Legacy</key>
+					<true/>
 					<key>LineType</key>
 					<integer>1</integer>
 					<key>TailArrow</key>
@@ -376,140 +618,280 @@
 			<key>Tail</key>
 			<dict>
 				<key>ID</key>
-				<integer>2</integer>
+				<integer>19</integer>
 			</dict>
 		</dict>
 		<dict>
-			<key>Bounds</key>
-			<string>{{294.173, 176.053}, {136, 98}}</string>
 			<key>Class</key>
-			<string>MultiTextGraphic</string>
-			<key>FitText</key>
-			<string>Vertical</string>
-			<key>Flow</key>
-			<string>Resize</string>
-			<key>ID</key>
-			<integer>2</integer>
-			<key>ListOrientation</key>
-			<string>Vertical</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>GradientAngle</key>
-					<real>304</real>
-					<key>GradientCenter</key>
-					<string>{-0.294118, -0.264706}</string>
-				</dict>
-			</dict>
-			<key>TextList</key>
+			<string>TableGroup</string>
+			<key>Graphics</key>
 			<array>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{294.173, 176.053}, {136, 14}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>20</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\b\fs24 \cf0 Stack}</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{294.173, 190.053}, {136, 28}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>21</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\fs24 \cf0 \
 }</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{294.173, 218.053}, {136, 56}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>22</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\fs24 \cf0 init\
 push\
 pop\
 }</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 			</array>
-			<key>TextPlacement</key>
-			<integer>0</integer>
+			<key>GridH</key>
+			<array>
+				<integer>20</integer>
+				<integer>21</integer>
+				<integer>22</integer>
+				<array/>
+			</array>
+			<key>GroupConnect</key>
+			<string>YES</string>
+			<key>ID</key>
+			<integer>19</integer>
 		</dict>
 		<dict>
-			<key>Bounds</key>
-			<string>{{221, 40}, {136, 98}}</string>
 			<key>Class</key>
-			<string>MultiTextGraphic</string>
-			<key>FitText</key>
-			<string>Vertical</string>
-			<key>Flow</key>
-			<string>Resize</string>
-			<key>ID</key>
-			<integer>1</integer>
-			<key>ListOrientation</key>
-			<string>Vertical</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>GradientAngle</key>
-					<real>304</real>
-					<key>GradientCenter</key>
-					<string>{-0.294118, -0.264706}</string>
-				</dict>
-			</dict>
-			<key>TextList</key>
+			<string>TableGroup</string>
+			<key>Graphics</key>
 			<array>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{221, 40}, {136, 14}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>23</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\b\fs24 \cf0 nx::Object}</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{221, 54}, {136, 28}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>24</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\fs24 \cf0 \
 }</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{221, 82}, {136, 56}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>25</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\fs24 \cf0 info\
 destroy\
-method\
-...}</string>
+...\
+}</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 			</array>
-			<key>TextPlacement</key>
-			<integer>0</integer>
+			<key>GridH</key>
+			<array>
+				<integer>23</integer>
+				<integer>24</integer>
+				<integer>25</integer>
+				<array/>
+			</array>
+			<key>GroupConnect</key>
+			<string>YES</string>
+			<key>ID</key>
+			<integer>1</integer>
 		</dict>
 	</array>
 	<key>GridInfo</key>
@@ -527,8 +909,8 @@
 	<integer>1</integer>
 	<key>ImageCounter</key>
 	<integer>1</integer>
-	<key>IsPalette</key>
-	<string>NO</string>
+	<key>KeepToScale</key>
+	<false/>
 	<key>Layers</key>
 	<array>
 		<dict>
@@ -544,146 +926,97 @@
 	</array>
 	<key>LayoutInfo</key>
 	<dict>
-		<key>ChildOrdering</key>
-		<integer>0</integer>
+		<key>Animate</key>
+		<string>NO</string>
+		<key>circoMinDist</key>
+		<real>18</real>
+		<key>circoSeparation</key>
+		<real>0.0</real>
+		<key>layoutEngine</key>
+		<string>dot</string>
+		<key>neatoSeparation</key>
+		<real>0.0</real>
+		<key>twopiSeparation</key>
+		<real>0.0</real>
 	</dict>
 	<key>LinksVisible</key>
 	<string>NO</string>
 	<key>MagnetsVisible</key>
 	<string>NO</string>
+	<key>MasterSheets</key>
+	<array/>
 	<key>ModificationDate</key>
-	<string>2011-01-08 18:46:58 +0100</string>
+	<string>2013-05-04 13:23:28 +0000</string>
 	<key>Modifier</key>
 	<string>Gustaf A. Neumann</string>
+	<key>NotesVisible</key>
+	<string>NO</string>
 	<key>Orientation</key>
 	<integer>2</integer>
+	<key>OriginVisible</key>
+	<string>NO</string>
 	<key>PageBreaks</key>
 	<string>YES</string>
-	<key>PageSetup</key>
-	<data>
-	BAt0eXBlZHN0cmVhbYED6IQBQISEhAtOU1ByaW50SW5mbwGEhAhOU09iamVjdACFkoSE
-	hBNOU011dGFibGVEaWN0aW9uYXJ5AISEDE5TRGljdGlvbmFyeQCUhAFpFpKEhIQITlNT
-	dHJpbmcBlIQBKxBOU0pvYkRpc3Bvc2l0aW9uhpKEmZkPTlNQcmludFNwb29sSm9ihpKE
-	mZkLTlNQYXBlclNpemWGkoSEhAdOU1ZhbHVlAJSEASqEhAx7X05TU2l6ZT1mZn2cgQJT
-	gQNKhpKEmZkUTlNWZXJ0aWNhbFBhZ2luYXRpb26GkoSEhAhOU051bWJlcgCdm4SXlwCG
-	koSZmQ9OU1BhZ2VzUGVyU2hlZXSGkoShm6KXAYaShJmZFE5TVmVydGljYWxseUNlbnRl
-	cmVkhpKkkoSZmRlOU1ByaW50UmV2ZXJzZU9yaWVudGF0aW9uhpKgkoSZmQ9OU1ByaW50
-	QWxsUGFnZXOGkqCShJmZC05TUGFwZXJOYW1lhpKEmZkGaXNvLWE0hpKEmZkITlNDb3Bp
-	ZXOGkqSShJmZD05TU2NhbGluZ0ZhY3RvcoaShKGbhIQBZJ4BhpKEmZkOTlNQTVBhZ2VG
-	b3JtYXSGkoSEhA1OU011dGFibGVEYXRhAISEBk5TRGF0YQCUl4EVL4QHWzU0MjNjXTw/
-	eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04Ij8+CjwhRE9DVFlQRSBwbGlz
-	dCBQVUJMSUMgIi0vL0FwcGxlLy9EVEQgUExJU1QgMS4wLy9FTiIgImh0dHA6Ly93d3cu
-	YXBwbGUuY29tL0RURHMvUHJvcGVydHlMaXN0LTEuMC5kdGQiPgo8cGxpc3QgdmVyc2lv
-	bj0iMS4wIj4KPGRpY3Q+Cgk8a2V5PmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0LlBN
-	SG9yaXpvbnRhbFJlczwva2V5PgoJPGRpY3Q+CgkJPGtleT5jb20uYXBwbGUucHJpbnQu
-	dGlja2V0LmNyZWF0b3I8L2tleT4KCQk8c3RyaW5nPmNvbS5hcHBsZS5qb2J0aWNrZXQ8
-	L3N0cmluZz4KCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuaXRlbUFycmF5PC9r
-	ZXk+CgkJPGFycmF5PgoJCQk8ZGljdD4KCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LlBh
-	Z2VGb3JtYXQuUE1Ib3Jpem9udGFsUmVzPC9rZXk+CgkJCQk8cmVhbD43MjwvcmVhbD4K
-	CQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5zdGF0ZUZsYWc8L2tleT4KCQkJ
-	CTxpbnRlZ2VyPjA8L2ludGVnZXI+CgkJCTwvZGljdD4KCQk8L2FycmF5PgoJPC9kaWN0
-	PgoJPGtleT5jb20uYXBwbGUucHJpbnQuUGFnZUZvcm1hdC5QTU9yaWVudGF0aW9uPC9r
-	ZXk+Cgk8ZGljdD4KCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuY3JlYXRvcjwv
-	a2V5PgoJCTxzdHJpbmc+Y29tLmFwcGxlLmpvYnRpY2tldDwvc3RyaW5nPgoJCTxrZXk+
-	Y29tLmFwcGxlLnByaW50LnRpY2tldC5pdGVtQXJyYXk8L2tleT4KCQk8YXJyYXk+CgkJ
-	CTxkaWN0PgoJCQkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFnZUZvcm1hdC5QTU9yaWVu
-	dGF0aW9uPC9rZXk+CgkJCQk8aW50ZWdlcj4xPC9pbnRlZ2VyPgoJCQkJPGtleT5jb20u
-	YXBwbGUucHJpbnQudGlja2V0LnN0YXRlRmxhZzwva2V5PgoJCQkJPGludGVnZXI+MDwv
-	aW50ZWdlcj4KCQkJPC9kaWN0PgoJCTwvYXJyYXk+Cgk8L2RpY3Q+Cgk8a2V5PmNvbS5h
-	cHBsZS5wcmludC5QYWdlRm9ybWF0LlBNU2NhbGluZzwva2V5PgoJPGRpY3Q+CgkJPGtl
-	eT5jb20uYXBwbGUucHJpbnQudGlja2V0LmNyZWF0b3I8L2tleT4KCQk8c3RyaW5nPmNv
-	bS5hcHBsZS5qb2J0aWNrZXQ8L3N0cmluZz4KCQk8a2V5PmNvbS5hcHBsZS5wcmludC50
-	aWNrZXQuaXRlbUFycmF5PC9rZXk+CgkJPGFycmF5PgoJCQk8ZGljdD4KCQkJCTxrZXk+
-	Y29tLmFwcGxlLnByaW50LlBhZ2VGb3JtYXQuUE1TY2FsaW5nPC9rZXk+CgkJCQk8cmVh
-	bD4xPC9yZWFsPgoJCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0LnN0YXRlRmxh
-	Zzwva2V5PgoJCQkJPGludGVnZXI+MDwvaW50ZWdlcj4KCQkJPC9kaWN0PgoJCTwvYXJy
-	YXk+Cgk8L2RpY3Q+Cgk8a2V5PmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0LlBNVmVy
-	dGljYWxSZXM8L2tleT4KCTxkaWN0PgoJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tl
-	dC5jcmVhdG9yPC9rZXk+CgkJPHN0cmluZz5jb20uYXBwbGUuam9idGlja2V0PC9zdHJp
-	bmc+CgkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0Lml0ZW1BcnJheTwva2V5PgoJ
-	CTxhcnJheT4KCQkJPGRpY3Q+CgkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC5QYWdlRm9y
-	bWF0LlBNVmVydGljYWxSZXM8L2tleT4KCQkJCTxyZWFsPjcyPC9yZWFsPgoJCQkJPGtl
-	eT5jb20uYXBwbGUucHJpbnQudGlja2V0LnN0YXRlRmxhZzwva2V5PgoJCQkJPGludGVn
-	ZXI+MDwvaW50ZWdlcj4KCQkJPC9kaWN0PgoJCTwvYXJyYXk+Cgk8L2RpY3Q+Cgk8a2V5
-	PmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0LlBNVmVydGljYWxTY2FsaW5nPC9rZXk+
-	Cgk8ZGljdD4KCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuY3JlYXRvcjwva2V5
-	PgoJCTxzdHJpbmc+Y29tLmFwcGxlLmpvYnRpY2tldDwvc3RyaW5nPgoJCTxrZXk+Y29t
-	LmFwcGxlLnByaW50LnRpY2tldC5pdGVtQXJyYXk8L2tleT4KCQk8YXJyYXk+CgkJCTxk
-	aWN0PgoJCQkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFnZUZvcm1hdC5QTVZlcnRpY2Fs
-	U2NhbGluZzwva2V5PgoJCQkJPHJlYWw+MTwvcmVhbD4KCQkJCTxrZXk+Y29tLmFwcGxl
-	LnByaW50LnRpY2tldC5zdGF0ZUZsYWc8L2tleT4KCQkJCTxpbnRlZ2VyPjA8L2ludGVn
-	ZXI+CgkJCTwvZGljdD4KCQk8L2FycmF5PgoJPC9kaWN0PgoJPGtleT5jb20uYXBwbGUu
-	cHJpbnQuc3ViVGlja2V0LnBhcGVyX2luZm9fdGlja2V0PC9rZXk+Cgk8ZGljdD4KCQk8
-	a2V5PmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0LlBNQWRqdXN0ZWRQYWdlUmVjdDwv
-	a2V5PgoJCTxkaWN0PgoJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuY3JlYXRv
-	cjwva2V5PgoJCQk8c3RyaW5nPmNvbS5hcHBsZS5qb2J0aWNrZXQ8L3N0cmluZz4KCQkJ
-	PGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0Lml0ZW1BcnJheTwva2V5PgoJCQk8YXJy
-	YXk+CgkJCQk8ZGljdD4KCQkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0
-	LlBNQWRqdXN0ZWRQYWdlUmVjdDwva2V5PgoJCQkJCTxhcnJheT4KCQkJCQkJPGludGVn
-	ZXI+MDwvaW50ZWdlcj4KCQkJCQkJPGludGVnZXI+MDwvaW50ZWdlcj4KCQkJCQkJPHJl
-	YWw+NzgzPC9yZWFsPgoJCQkJCQk8cmVhbD41NTk8L3JlYWw+CgkJCQkJPC9hcnJheT4K
-	CQkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuc3RhdGVGbGFnPC9rZXk+CgkJ
-	CQkJPGludGVnZXI+MDwvaW50ZWdlcj4KCQkJCTwvZGljdD4KCQkJPC9hcnJheT4KCQk8
-	L2RpY3Q+CgkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFnZUZvcm1hdC5QTUFkanVzdGVk
-	UGFwZXJSZWN0PC9rZXk+CgkJPGRpY3Q+CgkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRp
-	Y2tldC5jcmVhdG9yPC9rZXk+CgkJCTxzdHJpbmc+Y29tLmFwcGxlLmpvYnRpY2tldDwv
-	c3RyaW5nPgoJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuaXRlbUFycmF5PC9r
-	ZXk+CgkJCTxhcnJheT4KCQkJCTxkaWN0PgoJCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50
-	LlBhZ2VGb3JtYXQuUE1BZGp1c3RlZFBhcGVyUmVjdDwva2V5PgoJCQkJCTxhcnJheT4K
-	CQkJCQkJPHJlYWw+LTE4PC9yZWFsPgoJCQkJCQk8cmVhbD4tMTg8L3JlYWw+CgkJCQkJ
-	CTxyZWFsPjgyNDwvcmVhbD4KCQkJCQkJPHJlYWw+NTc3PC9yZWFsPgoJCQkJCTwvYXJy
-	YXk+CgkJCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0LnN0YXRlRmxhZzwva2V5
-	PgoJCQkJCTxpbnRlZ2VyPjA8L2ludGVnZXI+CgkJCQk8L2RpY3Q+CgkJCTwvYXJyYXk+
-	CgkJPC9kaWN0PgoJCTxrZXk+Y29tLmFwcGxlLnByaW50LlBhcGVySW5mby5QTVBhcGVy
-	TmFtZTwva2V5PgoJCTxkaWN0PgoJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQu
-	Y3JlYXRvcjwva2V5PgoJCQk8c3RyaW5nPmNvbS5hcHBsZS5qb2J0aWNrZXQ8L3N0cmlu
-	Zz4KCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0Lml0ZW1BcnJheTwva2V5PgoJ
-	CQk8YXJyYXk+CgkJCQk8ZGljdD4KCQkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC5QYXBl
-	ckluZm8uUE1QYXBlck5hbWU8L2tleT4KCQkJCQk8c3RyaW5nPmlzby1hNDwvc3RyaW5n
-	PgoJCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5zdGF0ZUZsYWc8L2tleT4K
-	CQkJCQk8aW50ZWdlcj4wPC9pbnRlZ2VyPgoJCQkJPC9kaWN0PgoJCQk8L2FycmF5PgoJ
-	CTwvZGljdD4KCQk8a2V5PmNvbS5hcHBsZS5wcmludC5QYXBlckluZm8uUE1VbmFkanVz
-	dGVkUGFnZVJlY3Q8L2tleT4KCQk8ZGljdD4KCQkJPGtleT5jb20uYXBwbGUucHJpbnQu
-	dGlja2V0LmNyZWF0b3I8L2tleT4KCQkJPHN0cmluZz5jb20uYXBwbGUuam9idGlja2V0
-	PC9zdHJpbmc+CgkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5pdGVtQXJyYXk8
-	L2tleT4KCQkJPGFycmF5PgoJCQkJPGRpY3Q+CgkJCQkJPGtleT5jb20uYXBwbGUucHJp
-	bnQuUGFwZXJJbmZvLlBNVW5hZGp1c3RlZFBhZ2VSZWN0PC9rZXk+CgkJCQkJPGFycmF5
-	PgoJCQkJCQk8cmVhbD4wLjA8L3JlYWw+CgkJCQkJCTxyZWFsPjAuMDwvcmVhbD4KCQkJ
-	CQkJPHJlYWw+NzgzPC9yZWFsPgoJCQkJCQk8cmVhbD41NTk8L3JlYWw+CgkJCQkJPC9h
-	cnJheT4KCQkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuc3RhdGVGbGFnPC9r
-	ZXk+CgkJCQkJPGludGVnZXI+MDwvaW50ZWdlcj4KCQkJCTwvZGljdD4KCQkJPC9hcnJh
-	eT4KCQk8L2RpY3Q+CgkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFwZXJJbmZvLlBNVW5h
-	ZGp1c3RlZFBhcGVyUmVjdDwva2V5PgoJCTxkaWN0PgoJCQk8a2V5PmNvbS5hcHBsZS5w
-	cmludC50aWNrZXQuY3JlYXRvcjwva2V5PgoJCQk8c3RyaW5nPmNvbS5hcHBsZS5qb2J0
-	aWNrZXQ8L3N0cmluZz4KCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0Lml0ZW1B
-	cnJheTwva2V5PgoJCQk8YXJyYXk+CgkJCQk8ZGljdD4KCQkJCQk8a2V5PmNvbS5hcHBs
-	ZS5wcmludC5QYXBlckluZm8uUE1VbmFkanVzdGVkUGFwZXJSZWN0PC9rZXk+CgkJCQkJ
-	PGFycmF5PgoJCQkJCQk8cmVhbD4tMTg8L3JlYWw+CgkJCQkJCTxyZWFsPi0xODwvcmVh
-	bD4KCQkJCQkJPHJlYWw+ODI0PC9yZWFsPgoJCQkJCQk8cmVhbD41Nzc8L3JlYWw+CgkJ
-	CQkJPC9hcnJheT4KCQkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuc3RhdGVG
-	bGFnPC9rZXk+CgkJCQkJPGludGVnZXI+MDwvaW50ZWdlcj4KCQkJCTwvZGljdD4KCQkJ
-	PC9hcnJheT4KCQk8L2RpY3Q+CgkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFwZXJJbmZv
-	LnBwZC5QTVBhcGVyTmFtZTwva2V5PgoJCTxkaWN0PgoJCQk8a2V5PmNvbS5hcHBsZS5w
-	cmludC50aWNrZXQuY3JlYXRvcjwva2V5PgoJCQk8c3RyaW5nPmNvbS5hcHBsZS5qb2J0
-	aWNrZXQ8L3N0cmluZz4KCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0Lml0ZW1B
-	cnJheTwva2V5PgoJCQk8YXJyYXk+CgkJCQk8ZGljdD4KCQkJCQk8a2V5PmNvbS5hcHBs
-	ZS5wcmludC5QYXBlckluZm8ucHBkLlBNUGFwZXJOYW1lPC9rZXk+CgkJCQkJPHN0cmlu
-	Zz5BNDwvc3RyaW5nPgoJCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5zdGF0
-	ZUZsYWc8L2tleT4KCQkJCQk8aW50ZWdlcj4wPC9pbnRlZ2VyPgoJCQkJPC9kaWN0PgoJ
-	CQk8L2FycmF5PgoJCTwvZGljdD4KCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQu
-	QVBJVmVyc2lvbjwva2V5PgoJCTxzdHJpbmc+MDAuMjA8L3N0cmluZz4KCQk8a2V5PmNv
-	bS5hcHBsZS5wcmludC50aWNrZXQudHlwZTwva2V5PgoJCTxzdHJpbmc+Y29tLmFwcGxl
-	LnByaW50LlBhcGVySW5mb1RpY2tldDwvc3RyaW5nPgoJPC9kaWN0PgoJPGtleT5jb20u
-	YXBwbGUucHJpbnQudGlja2V0LkFQSVZlcnNpb248L2tleT4KCTxzdHJpbmc+MDAuMjA8
-	L3N0cmluZz4KCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC50eXBlPC9rZXk+Cgk8
-	c3RyaW5nPmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0VGlja2V0PC9zdHJpbmc+Cjwv
-	ZGljdD4KPC9wbGlzdD4KhpKEmZkNTlNSaWdodE1hcmdpboaShKGbrZ4AhpKEmZkWTlNI
-	b3Jpem9udGFsbHlDZW50ZXJlZIaSpJKEmZkVTlNIb3Jpem9uYWxQYWdpbmF0aW9uhpKg
-	koSZmQ1OU0pvYkZlYXR1cmVzhpKElpcAhpKEmZkMTlNMZWZ0TWFyZ2luhpKEoZutngCG
-	koSZmQtOU1RvcE1hcmdpboaShKGbrZ4AhpKEmZkSTlNSZXZlcnNlUGFnZU9yZGVyhpKg
-	koSZmQ5OU0JvdHRvbU1hcmdpboaShKGbrZ4AhpKEmZkKTlNMYXN0UGFnZYaShKGbopeC
-	f////4aShJmZC05TRmlyc3RQYWdlhpKkkoSZmQ1OU09yaWVudGF0aW9uhpKghoY=
-	</data>
+	<key>PrintInfo</key>
+	<dict>
+		<key>NSBottomMargin</key>
+		<array>
+			<string>float</string>
+			<string>18</string>
+		</array>
+		<key>NSHorizonalPagination</key>
+		<array>
+			<string>int</string>
+			<string>0</string>
+		</array>
+		<key>NSJobFeatures</key>
+		<array>
+			<string>coded</string>
+			<string>BAtzdHJlYW10eXBlZIHoA4QBQISEhBNOU011dGFibGVEaWN0aW9uYXJ5AISEDE5TRGljdGlvbmFyeQCEhAhOU09iamVjdACFhAFpAIY=</string>
+		</array>
+		<key>NSLeftMargin</key>
+		<array>
+			<string>float</string>
+			<string>18</string>
+		</array>
+		<key>NSPagesPerSheet</key>
+		<array>
+			<string>int</string>
+			<string>1</string>
+		</array>
+		<key>NSPaperSize</key>
+		<array>
+			<string>size</string>
+			<string>{595, 842}</string>
+		</array>
+		<key>NSPrintAllPages</key>
+		<array>
+			<string>int</string>
+			<string>0</string>
+		</array>
+		<key>NSPrintReverseOrientation</key>
+		<array>
+			<string>int</string>
+			<string>0</string>
+		</array>
+		<key>NSReversePageOrder</key>
+		<array>
+			<string>int</string>
+			<string>0</string>
+		</array>
+		<key>NSRightMargin</key>
+		<array>
+			<string>float</string>
+			<string>18</string>
+		</array>
+		<key>NSTopMargin</key>
+		<array>
+			<string>float</string>
+			<string>41</string>
+		</array>
+	</dict>
+	<key>PrintOnePage</key>
+	<false/>
 	<key>ReadOnly</key>
 	<string>NO</string>
 	<key>RowAlign</key>
@@ -696,24 +1029,42 @@
 	<string>YES</string>
 	<key>SmartDistanceGuidesActive</key>
 	<string>YES</string>
+	<key>UniqueID</key>
+	<integer>1</integer>
 	<key>UseEntirePage</key>
 	<true/>
 	<key>VPages</key>
 	<integer>1</integer>
 	<key>WindowInfo</key>
 	<dict>
 		<key>CurrentSheet</key>
-		<string>0</string>
+		<integer>0</integer>
+		<key>ExpandedCanvases</key>
+		<array/>
 		<key>Frame</key>
-		<string>{{522, 419}, {537, 755}}</string>
-		<key>ShowRuler</key>
+		<string>{{522, 410}, {758, 764}}</string>
+		<key>ListView</key>
 		<false/>
-		<key>ShowStatusBar</key>
+		<key>OutlineWidth</key>
+		<integer>142</integer>
+		<key>RightSidebar</key>
+		<false/>
+		<key>Sidebar</key>
 		<true/>
+		<key>SidebarWidth</key>
+		<integer>138</integer>
 		<key>VisibleRegion</key>
-		<string>{{0, 3}, {522, 657}}</string>
+		<string>{{-30, 1}, {620, 670}}</string>
 		<key>Zoom</key>
-		<string>1</string>
+		<real>1</real>
+		<key>ZoomValues</key>
+		<array>
+			<array>
+				<string>Canvas 1</string>
+				<real>1</real>
+				<real>1</real>
+			</array>
+		</array>
 	</dict>
 </dict>
 </plist>
Index: doc/next-tutorial/per-class-mixin.png
===================================================================
diff -u -re1a3b4786ffd146bbc52f4ac2276df3f9bc9122e -rd00b7a9fa608e137faea6e52ded881b871d5c29e
Binary files differ
Index: doc/next-tutorial/per-object-mixin.graffle
===================================================================
diff -u -re1a3b4786ffd146bbc52f4ac2276df3f9bc9122e -rd00b7a9fa608e137faea6e52ded881b871d5c29e
--- doc/next-tutorial/per-object-mixin.graffle	(.../per-object-mixin.graffle)	(revision e1a3b4786ffd146bbc52f4ac2276df3f9bc9122e)
+++ doc/next-tutorial/per-object-mixin.graffle	(.../per-object-mixin.graffle)	(revision d00b7a9fa608e137faea6e52ded881b871d5c29e)
@@ -2,25 +2,105 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CanvasColor</key>
+	<key>ActiveLayerIndex</key>
+	<integer>0</integer>
+	<key>ApplicationVersion</key>
+	<array>
+		<string>com.omnigroup.OmniGrafflePro</string>
+		<string>139.7.0.167456</string>
+	</array>
+	<key>AutoAdjust</key>
+	<false/>
+	<key>BackgroundGraphic</key>
 	<dict>
-		<key>w</key>
-		<string>1</string>
+		<key>Bounds</key>
+		<string>{{0, 0}, {559, 783}}</string>
+		<key>Class</key>
+		<string>SolidGraphic</string>
+		<key>ID</key>
+		<integer>2</integer>
+		<key>Style</key>
+		<dict>
+			<key>shadow</key>
+			<dict>
+				<key>Draws</key>
+				<string>NO</string>
+			</dict>
+			<key>stroke</key>
+			<dict>
+				<key>Draws</key>
+				<string>NO</string>
+			</dict>
+		</dict>
 	</dict>
+	<key>BaseZoom</key>
+	<integer>0</integer>
+	<key>CanvasOrigin</key>
+	<string>{0, 0}</string>
 	<key>ColumnAlign</key>
 	<integer>1</integer>
 	<key>ColumnSpacing</key>
 	<real>36</real>
 	<key>CreationDate</key>
-	<string>2009-12-29 16:06:59 +0100</string>
+	<string>2009-12-29 15:06:59 +0000</string>
 	<key>Creator</key>
 	<string>Gustaf A. Neumann</string>
+	<key>DisplayScale</key>
+	<string>1.000 cm = 1.000 cm</string>
 	<key>GraphDocumentVersion</key>
-	<integer>4</integer>
+	<integer>8</integer>
 	<key>GraphicsList</key>
 	<array>
 		<dict>
+			<key>Bounds</key>
+			<string>{{336.66165741469348, 303.02532815884581}, {75, 24}}</string>
 			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>ID</key>
+			<integer>11</integer>
+			<key>Line</key>
+			<dict>
+				<key>ID</key>
+				<integer>10</integer>
+				<key>Position</key>
+				<real>0.53307443857192993</real>
+				<key>RotationType</key>
+				<integer>0</integer>
+			</dict>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Align</key>
+				<integer>0</integer>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
+
+\f0\fs18 \cf0 instance of}</string>
+				<key>VerticalPad</key>
+				<integer>0</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>AllowLabelDrop</key>
+			<false/>
+			<key>Class</key>
 			<string>LineGraphic</string>
 			<key>Head</key>
 			<dict>
@@ -29,41 +109,20 @@
 			</dict>
 			<key>ID</key>
 			<integer>10</integer>
-			<key>Labels</key>
-			<array>
-				<dict>
-					<key>Label</key>
-					<dict>
-						<key>Align</key>
-						<integer>0</integer>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-
-\f0\fs18 \cf0 instance of}</string>
-					</dict>
-					<key>LabelVisible</key>
-					<string>YES</string>
-					<key>Offset</key>
-					<real>0.0</real>
-					<key>Position</key>
-					<real>0.53307443857192993</real>
-				</dict>
-			</array>
 			<key>Points</key>
 			<array>
-				<string>{352.91, 277.519}</string>
+				<string>{352.90962682497189, 277.51900000000001}</string>
 				<string>{381, 329}</string>
-				<string>{375.173, 338.692}</string>
+				<string>{375.43063138316342, 338.26348389126144}</string>
 			</array>
 			<key>Style</key>
 			<dict>
 				<key>stroke</key>
 				<dict>
 					<key>HeadArrow</key>
 					<string>0</string>
+					<key>Legacy</key>
+					<true/>
 					<key>LineType</key>
 					<integer>1</integer>
 					<key>Pattern</key>
@@ -75,12 +134,12 @@
 			<key>Tail</key>
 			<dict>
 				<key>ID</key>
-				<integer>2</integer>
+				<integer>17</integer>
 			</dict>
 		</dict>
 		<dict>
 			<key>Bounds</key>
-			<string>{{330.173, 338.692}, {90, 36}}</string>
+			<string>{{330.173, 338.69200000000001}, {90, 36}}</string>
 			<key>Class</key>
 			<string>ShapedGraphic</string>
 			<key>ID</key>
@@ -94,19 +153,73 @@
 			</array>
 			<key>Shape</key>
 			<string>Rectangle</string>
+			<key>Style</key>
+			<dict/>
 			<key>Text</key>
 			<dict>
+				<key>Align</key>
+				<integer>0</integer>
 				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\b\fs24 \cf0 s1 : Stack}</string>
+				<key>VerticalPad</key>
+				<integer>0</integer>
 			</dict>
 		</dict>
 		<dict>
+			<key>Bounds</key>
+			<string>{{77.418645028395531, 310.12415423604705}, {75, 24}}</string>
 			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>ID</key>
+			<integer>12</integer>
+			<key>Line</key>
+			<dict>
+				<key>ID</key>
+				<integer>8</integer>
+				<key>Position</key>
+				<real>0.61400783061981201</real>
+				<key>RotationType</key>
+				<integer>0</integer>
+			</dict>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Align</key>
+				<integer>0</integer>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
+
+\f0\fs18 \cf0 per-object mixin}</string>
+				<key>VerticalPad</key>
+				<integer>0</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>AllowLabelDrop</key>
+			<false/>
+			<key>Class</key>
 			<string>LineGraphic</string>
 			<key>Head</key>
 			<dict>
@@ -115,41 +228,20 @@
 			</dict>
 			<key>ID</key>
 			<integer>8</integer>
-			<key>Labels</key>
-			<array>
-				<dict>
-					<key>Label</key>
-					<dict>
-						<key>Align</key>
-						<integer>0</integer>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-
-\f0\fs18 \cf0 per-object mixin}</string>
-					</dict>
-					<key>LabelVisible</key>
-					<string>YES</string>
-					<key>Offset</key>
-					<real>0.0</real>
-					<key>Position</key>
-					<real>0.61400783061981201</real>
-				</dict>
-			</array>
 			<key>Points</key>
 			<array>
-				<string>{173, 356.692}</string>
+				<string>{173, 356.69200000000001}</string>
 				<string>{118, 329}</string>
-				<string>{118.177, 277.519}</string>
+				<string>{118.177374052806, 277.51900000000001}</string>
 			</array>
 			<key>Style</key>
 			<dict>
 				<key>stroke</key>
 				<dict>
 					<key>HeadArrow</key>
 					<string>0</string>
+					<key>Legacy</key>
+					<true/>
 					<key>LineType</key>
 					<integer>1</integer>
 					<key>Pattern</key>
@@ -165,6 +257,8 @@
 			</dict>
 		</dict>
 		<dict>
+			<key>AllowLabelDrop</key>
+			<false/>
 			<key>Class</key>
 			<string>LineGraphic</string>
 			<key>Head</key>
@@ -176,15 +270,17 @@
 			<integer>7</integer>
 			<key>Points</key>
 			<array>
-				<string>{178.281, 179.519}</string>
-				<string>{229.065, 138}</string>
+				<string>{178.25987156357274, 179.51900000000001}</string>
+				<string>{229.0263150257764, 138}</string>
 			</array>
 			<key>Style</key>
 			<dict>
 				<key>stroke</key>
 				<dict>
 					<key>HeadArrow</key>
 					<string>UMLInheritance</string>
+					<key>Legacy</key>
+					<true/>
 					<key>LineType</key>
 					<integer>1</integer>
 					<key>TailArrow</key>
@@ -198,73 +294,191 @@
 			</dict>
 		</dict>
 		<dict>
-			<key>Bounds</key>
-			<string>{{50.3462, 179.519}, {136, 98}}</string>
 			<key>Class</key>
-			<string>MultiTextGraphic</string>
-			<key>FitText</key>
-			<string>Vertical</string>
-			<key>Flow</key>
-			<string>Resize</string>
-			<key>ID</key>
-			<integer>6</integer>
-			<key>ListOrientation</key>
-			<string>Vertical</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>GradientAngle</key>
-					<real>304</real>
-					<key>GradientCenter</key>
-					<string>{-0.294118, -0.264706}</string>
-				</dict>
-			</dict>
-			<key>TextList</key>
+			<string>TableGroup</string>
+			<key>Graphics</key>
 			<array>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{50.34620000000001, 179.51900000000001}, {136, 14}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>13</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\b\fs24 \cf0 Safety}</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{50.34620000000001, 193.51900000000001}, {136, 28}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>14</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\fs24 \cf0 \
 }</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{50.34620000000001, 221.51900000000001}, {136, 56}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>15</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\fs24 \cf0 init\
 push\
 pop\
 }</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 			</array>
-			<key>TextPlacement</key>
-			<integer>0</integer>
+			<key>GridH</key>
+			<array>
+				<integer>13</integer>
+				<integer>14</integer>
+				<integer>15</integer>
+				<array/>
+			</array>
+			<key>GroupConnect</key>
+			<string>YES</string>
+			<key>ID</key>
+			<integer>6</integer>
 		</dict>
 		<dict>
+			<key>Bounds</key>
+			<string>{{274.86819601096846, 313.266292721502}, {75, 24}}</string>
 			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>ID</key>
+			<integer>16</integer>
+			<key>Line</key>
+			<dict>
+				<key>ID</key>
+				<integer>5</integer>
+				<key>Position</key>
+				<real>0.42326045036315918</real>
+				<key>RotationType</key>
+				<integer>0</integer>
+			</dict>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Align</key>
+				<integer>0</integer>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
+
+\f0\fs18 \cf0 instance of}</string>
+				<key>VerticalPad</key>
+				<integer>0</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>AllowLabelDrop</key>
+			<false/>
+			<key>Class</key>
 			<string>LineGraphic</string>
 			<key>Head</key>
 			<dict>
@@ -273,41 +487,20 @@
 			</dict>
 			<key>ID</key>
 			<integer>5</integer>
-			<key>Labels</key>
-			<array>
-				<dict>
-					<key>Label</key>
-					<dict>
-						<key>Align</key>
-						<integer>0</integer>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-
-\f0\fs18 \cf0 instance of}</string>
-					</dict>
-					<key>LabelVisible</key>
-					<string>YES</string>
-					<key>Offset</key>
-					<real>0.0</real>
-					<key>Position</key>
-					<real>0.42326045036315918</real>
-				</dict>
-			</array>
 			<key>Points</key>
 			<array>
-				<string>{317.81, 277.519}</string>
+				<string>{317.81022166395883, 277.51900000000001}</string>
 				<string>{308, 335}</string>
-				<string>{263, 356.692}</string>
+				<string>{263, 356.69200000000001}</string>
 			</array>
 			<key>Style</key>
 			<dict>
 				<key>stroke</key>
 				<dict>
 					<key>HeadArrow</key>
 					<string>0</string>
+					<key>Legacy</key>
+					<true/>
 					<key>LineType</key>
 					<integer>1</integer>
 					<key>Pattern</key>
@@ -319,12 +512,12 @@
 			<key>Tail</key>
 			<dict>
 				<key>ID</key>
-				<integer>2</integer>
+				<integer>17</integer>
 			</dict>
 		</dict>
 		<dict>
 			<key>Bounds</key>
-			<string>{{173, 338.692}, {90, 36}}</string>
+			<string>{{173, 338.69200000000001}, {90, 36}}</string>
 			<key>Class</key>
 			<string>ShapedGraphic</string>
 			<key>ID</key>
@@ -338,18 +531,26 @@
 			</array>
 			<key>Shape</key>
 			<string>Rectangle</string>
+			<key>Style</key>
+			<dict/>
 			<key>Text</key>
 			<dict>
+				<key>Align</key>
+				<integer>0</integer>
 				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\b\fs24 \cf0 s2 : Stack}</string>
+				<key>VerticalPad</key>
+				<integer>0</integer>
 			</dict>
 		</dict>
 		<dict>
+			<key>AllowLabelDrop</key>
+			<false/>
 			<key>Class</key>
 			<string>LineGraphic</string>
 			<key>Head</key>
@@ -361,15 +562,17 @@
 			<integer>3</integer>
 			<key>Points</key>
 			<array>
-				<string>{313.118, 179.519}</string>
-				<string>{302.055, 138}</string>
+				<string>{313.12218652157128, 179.51900000000001}</string>
+				<string>{302.06388601522673, 138}</string>
 			</array>
 			<key>Style</key>
 			<dict>
 				<key>stroke</key>
 				<dict>
 					<key>HeadArrow</key>
 					<string>UMLInheritance</string>
+					<key>Legacy</key>
+					<true/>
 					<key>LineType</key>
 					<integer>1</integer>
 					<key>TailArrow</key>
@@ -379,140 +582,280 @@
 			<key>Tail</key>
 			<dict>
 				<key>ID</key>
-				<integer>2</integer>
+				<integer>17</integer>
 			</dict>
 		</dict>
 		<dict>
-			<key>Bounds</key>
-			<string>{{258.173, 179.519}, {136, 98}}</string>
 			<key>Class</key>
-			<string>MultiTextGraphic</string>
-			<key>FitText</key>
-			<string>Vertical</string>
-			<key>Flow</key>
-			<string>Resize</string>
-			<key>ID</key>
-			<integer>2</integer>
-			<key>ListOrientation</key>
-			<string>Vertical</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>GradientAngle</key>
-					<real>304</real>
-					<key>GradientCenter</key>
-					<string>{-0.294118, -0.264706}</string>
-				</dict>
-			</dict>
-			<key>TextList</key>
+			<string>TableGroup</string>
+			<key>Graphics</key>
 			<array>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{258.173, 179.51900000000001}, {136, 14}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>18</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\b\fs24 \cf0 Stack}</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{258.173, 193.51900000000001}, {136, 28}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>19</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\fs24 \cf0 \
 }</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{258.173, 221.51900000000001}, {136, 56}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>20</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\fs24 \cf0 init\
 push\
 pop\
 }</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 			</array>
-			<key>TextPlacement</key>
-			<integer>0</integer>
+			<key>GridH</key>
+			<array>
+				<integer>18</integer>
+				<integer>19</integer>
+				<integer>20</integer>
+				<array/>
+			</array>
+			<key>GroupConnect</key>
+			<string>YES</string>
+			<key>ID</key>
+			<integer>17</integer>
 		</dict>
 		<dict>
-			<key>Bounds</key>
-			<string>{{221, 40}, {136, 98}}</string>
 			<key>Class</key>
-			<string>MultiTextGraphic</string>
-			<key>FitText</key>
-			<string>Vertical</string>
-			<key>Flow</key>
-			<string>Resize</string>
-			<key>ID</key>
-			<integer>1</integer>
-			<key>ListOrientation</key>
-			<string>Vertical</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>GradientAngle</key>
-					<real>304</real>
-					<key>GradientCenter</key>
-					<string>{-0.294118, -0.264706}</string>
-				</dict>
-			</dict>
-			<key>TextList</key>
+			<string>TableGroup</string>
+			<key>Graphics</key>
 			<array>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{221, 40}, {136, 14}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>21</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\b\fs24 \cf0 nx::Object}</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{221, 54}, {136, 28}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>22</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\fs24 \cf0 \
 }</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 				<dict>
-					<key>Align</key>
-					<integer>0</integer>
+					<key>Bounds</key>
+					<string>{{221, 82}, {136, 56}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>Vertical</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>ID</key>
+					<integer>23</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>GradientCenter</key>
+							<string>{-0.29411799999999999, -0.264706}</string>
+						</dict>
+					</dict>
 					<key>Text</key>
-					<string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
 \f0\fs24 \cf0 info\
 destroy\
-method\
-...}</string>
+...\
+}</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
 				</dict>
 			</array>
-			<key>TextPlacement</key>
-			<integer>0</integer>
+			<key>GridH</key>
+			<array>
+				<integer>21</integer>
+				<integer>22</integer>
+				<integer>23</integer>
+				<array/>
+			</array>
+			<key>GroupConnect</key>
+			<string>YES</string>
+			<key>ID</key>
+			<integer>1</integer>
 		</dict>
 	</array>
 	<key>GridInfo</key>
@@ -530,8 +873,8 @@
 	<integer>1</integer>
 	<key>ImageCounter</key>
 	<integer>1</integer>
-	<key>IsPalette</key>
-	<string>NO</string>
+	<key>KeepToScale</key>
+	<false/>
 	<key>Layers</key>
 	<array>
 		<dict>
@@ -547,146 +890,97 @@
 	</array>
 	<key>LayoutInfo</key>
 	<dict>
-		<key>ChildOrdering</key>
-		<integer>0</integer>
+		<key>Animate</key>
+		<string>NO</string>
+		<key>circoMinDist</key>
+		<real>18</real>
+		<key>circoSeparation</key>
+		<real>0.0</real>
+		<key>layoutEngine</key>
+		<string>dot</string>
+		<key>neatoSeparation</key>
+		<real>0.0</real>
+		<key>twopiSeparation</key>
+		<real>0.0</real>
 	</dict>
 	<key>LinksVisible</key>
 	<string>NO</string>
 	<key>MagnetsVisible</key>
 	<string>NO</string>
+	<key>MasterSheets</key>
+	<array/>
 	<key>ModificationDate</key>
-	<string>2011-01-08 18:46:32 +0100</string>
+	<string>2013-05-04 13:24:25 +0000</string>
 	<key>Modifier</key>
 	<string>Gustaf A. Neumann</string>
+	<key>NotesVisible</key>
+	<string>NO</string>
 	<key>Orientation</key>
 	<integer>2</integer>
+	<key>OriginVisible</key>
+	<string>NO</string>
 	<key>PageBreaks</key>
 	<string>YES</string>
-	<key>PageSetup</key>
-	<data>
-	BAt0eXBlZHN0cmVhbYED6IQBQISEhAtOU1ByaW50SW5mbwGEhAhOU09iamVjdACFkoSE
-	hBNOU011dGFibGVEaWN0aW9uYXJ5AISEDE5TRGljdGlvbmFyeQCUhAFpFpKEhIQITlNT
-	dHJpbmcBlIQBKxBOU0pvYkRpc3Bvc2l0aW9uhpKEmZkPTlNQcmludFNwb29sSm9ihpKE
-	mZkLTlNQYXBlclNpemWGkoSEhAdOU1ZhbHVlAJSEASqEhAx7X05TU2l6ZT1mZn2cgQJT
-	gQNKhpKEmZkUTlNWZXJ0aWNhbFBhZ2luYXRpb26GkoSEhAhOU051bWJlcgCdm4SXlwCG
-	koSZmQ9OU1BhZ2VzUGVyU2hlZXSGkoShm6KXAYaShJmZFE5TVmVydGljYWxseUNlbnRl
-	cmVkhpKkkoSZmRlOU1ByaW50UmV2ZXJzZU9yaWVudGF0aW9uhpKgkoSZmQ9OU1ByaW50
-	QWxsUGFnZXOGkqCShJmZC05TUGFwZXJOYW1lhpKEmZkGaXNvLWE0hpKEmZkITlNDb3Bp
-	ZXOGkqSShJmZD05TU2NhbGluZ0ZhY3RvcoaShKGbhIQBZJ4BhpKEmZkOTlNQTVBhZ2VG
-	b3JtYXSGkoSEhA1OU011dGFibGVEYXRhAISEBk5TRGF0YQCUl4EVL4QHWzU0MjNjXTw/
-	eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04Ij8+CjwhRE9DVFlQRSBwbGlz
-	dCBQVUJMSUMgIi0vL0FwcGxlLy9EVEQgUExJU1QgMS4wLy9FTiIgImh0dHA6Ly93d3cu
-	YXBwbGUuY29tL0RURHMvUHJvcGVydHlMaXN0LTEuMC5kdGQiPgo8cGxpc3QgdmVyc2lv
-	bj0iMS4wIj4KPGRpY3Q+Cgk8a2V5PmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0LlBN
-	SG9yaXpvbnRhbFJlczwva2V5PgoJPGRpY3Q+CgkJPGtleT5jb20uYXBwbGUucHJpbnQu
-	dGlja2V0LmNyZWF0b3I8L2tleT4KCQk8c3RyaW5nPmNvbS5hcHBsZS5qb2J0aWNrZXQ8
-	L3N0cmluZz4KCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuaXRlbUFycmF5PC9r
-	ZXk+CgkJPGFycmF5PgoJCQk8ZGljdD4KCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LlBh
-	Z2VGb3JtYXQuUE1Ib3Jpem9udGFsUmVzPC9rZXk+CgkJCQk8cmVhbD43MjwvcmVhbD4K
-	CQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5zdGF0ZUZsYWc8L2tleT4KCQkJ
-	CTxpbnRlZ2VyPjA8L2ludGVnZXI+CgkJCTwvZGljdD4KCQk8L2FycmF5PgoJPC9kaWN0
-	PgoJPGtleT5jb20uYXBwbGUucHJpbnQuUGFnZUZvcm1hdC5QTU9yaWVudGF0aW9uPC9r
-	ZXk+Cgk8ZGljdD4KCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuY3JlYXRvcjwv
-	a2V5PgoJCTxzdHJpbmc+Y29tLmFwcGxlLmpvYnRpY2tldDwvc3RyaW5nPgoJCTxrZXk+
-	Y29tLmFwcGxlLnByaW50LnRpY2tldC5pdGVtQXJyYXk8L2tleT4KCQk8YXJyYXk+CgkJ
-	CTxkaWN0PgoJCQkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFnZUZvcm1hdC5QTU9yaWVu
-	dGF0aW9uPC9rZXk+CgkJCQk8aW50ZWdlcj4xPC9pbnRlZ2VyPgoJCQkJPGtleT5jb20u
-	YXBwbGUucHJpbnQudGlja2V0LnN0YXRlRmxhZzwva2V5PgoJCQkJPGludGVnZXI+MDwv
-	aW50ZWdlcj4KCQkJPC9kaWN0PgoJCTwvYXJyYXk+Cgk8L2RpY3Q+Cgk8a2V5PmNvbS5h
-	cHBsZS5wcmludC5QYWdlRm9ybWF0LlBNU2NhbGluZzwva2V5PgoJPGRpY3Q+CgkJPGtl
-	eT5jb20uYXBwbGUucHJpbnQudGlja2V0LmNyZWF0b3I8L2tleT4KCQk8c3RyaW5nPmNv
-	bS5hcHBsZS5qb2J0aWNrZXQ8L3N0cmluZz4KCQk8a2V5PmNvbS5hcHBsZS5wcmludC50
-	aWNrZXQuaXRlbUFycmF5PC9rZXk+CgkJPGFycmF5PgoJCQk8ZGljdD4KCQkJCTxrZXk+
-	Y29tLmFwcGxlLnByaW50LlBhZ2VGb3JtYXQuUE1TY2FsaW5nPC9rZXk+CgkJCQk8cmVh
-	bD4xPC9yZWFsPgoJCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0LnN0YXRlRmxh
-	Zzwva2V5PgoJCQkJPGludGVnZXI+MDwvaW50ZWdlcj4KCQkJPC9kaWN0PgoJCTwvYXJy
-	YXk+Cgk8L2RpY3Q+Cgk8a2V5PmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0LlBNVmVy
-	dGljYWxSZXM8L2tleT4KCTxkaWN0PgoJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tl
-	dC5jcmVhdG9yPC9rZXk+CgkJPHN0cmluZz5jb20uYXBwbGUuam9idGlja2V0PC9zdHJp
-	bmc+CgkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0Lml0ZW1BcnJheTwva2V5PgoJ
-	CTxhcnJheT4KCQkJPGRpY3Q+CgkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC5QYWdlRm9y
-	bWF0LlBNVmVydGljYWxSZXM8L2tleT4KCQkJCTxyZWFsPjcyPC9yZWFsPgoJCQkJPGtl
-	eT5jb20uYXBwbGUucHJpbnQudGlja2V0LnN0YXRlRmxhZzwva2V5PgoJCQkJPGludGVn
-	ZXI+MDwvaW50ZWdlcj4KCQkJPC9kaWN0PgoJCTwvYXJyYXk+Cgk8L2RpY3Q+Cgk8a2V5
-	PmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0LlBNVmVydGljYWxTY2FsaW5nPC9rZXk+
-	Cgk8ZGljdD4KCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuY3JlYXRvcjwva2V5
-	PgoJCTxzdHJpbmc+Y29tLmFwcGxlLmpvYnRpY2tldDwvc3RyaW5nPgoJCTxrZXk+Y29t
-	LmFwcGxlLnByaW50LnRpY2tldC5pdGVtQXJyYXk8L2tleT4KCQk8YXJyYXk+CgkJCTxk
-	aWN0PgoJCQkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFnZUZvcm1hdC5QTVZlcnRpY2Fs
-	U2NhbGluZzwva2V5PgoJCQkJPHJlYWw+MTwvcmVhbD4KCQkJCTxrZXk+Y29tLmFwcGxl
-	LnByaW50LnRpY2tldC5zdGF0ZUZsYWc8L2tleT4KCQkJCTxpbnRlZ2VyPjA8L2ludGVn
-	ZXI+CgkJCTwvZGljdD4KCQk8L2FycmF5PgoJPC9kaWN0PgoJPGtleT5jb20uYXBwbGUu
-	cHJpbnQuc3ViVGlja2V0LnBhcGVyX2luZm9fdGlja2V0PC9rZXk+Cgk8ZGljdD4KCQk8
-	a2V5PmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0LlBNQWRqdXN0ZWRQYWdlUmVjdDwv
-	a2V5PgoJCTxkaWN0PgoJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuY3JlYXRv
-	cjwva2V5PgoJCQk8c3RyaW5nPmNvbS5hcHBsZS5qb2J0aWNrZXQ8L3N0cmluZz4KCQkJ
-	PGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0Lml0ZW1BcnJheTwva2V5PgoJCQk8YXJy
-	YXk+CgkJCQk8ZGljdD4KCQkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0
-	LlBNQWRqdXN0ZWRQYWdlUmVjdDwva2V5PgoJCQkJCTxhcnJheT4KCQkJCQkJPGludGVn
-	ZXI+MDwvaW50ZWdlcj4KCQkJCQkJPGludGVnZXI+MDwvaW50ZWdlcj4KCQkJCQkJPHJl
-	YWw+NzgzPC9yZWFsPgoJCQkJCQk8cmVhbD41NTk8L3JlYWw+CgkJCQkJPC9hcnJheT4K
-	CQkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuc3RhdGVGbGFnPC9rZXk+CgkJ
-	CQkJPGludGVnZXI+MDwvaW50ZWdlcj4KCQkJCTwvZGljdD4KCQkJPC9hcnJheT4KCQk8
-	L2RpY3Q+CgkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFnZUZvcm1hdC5QTUFkanVzdGVk
-	UGFwZXJSZWN0PC9rZXk+CgkJPGRpY3Q+CgkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRp
-	Y2tldC5jcmVhdG9yPC9rZXk+CgkJCTxzdHJpbmc+Y29tLmFwcGxlLmpvYnRpY2tldDwv
-	c3RyaW5nPgoJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuaXRlbUFycmF5PC9r
-	ZXk+CgkJCTxhcnJheT4KCQkJCTxkaWN0PgoJCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50
-	LlBhZ2VGb3JtYXQuUE1BZGp1c3RlZFBhcGVyUmVjdDwva2V5PgoJCQkJCTxhcnJheT4K
-	CQkJCQkJPHJlYWw+LTE4PC9yZWFsPgoJCQkJCQk8cmVhbD4tMTg8L3JlYWw+CgkJCQkJ
-	CTxyZWFsPjgyNDwvcmVhbD4KCQkJCQkJPHJlYWw+NTc3PC9yZWFsPgoJCQkJCTwvYXJy
-	YXk+CgkJCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0LnN0YXRlRmxhZzwva2V5
-	PgoJCQkJCTxpbnRlZ2VyPjA8L2ludGVnZXI+CgkJCQk8L2RpY3Q+CgkJCTwvYXJyYXk+
-	CgkJPC9kaWN0PgoJCTxrZXk+Y29tLmFwcGxlLnByaW50LlBhcGVySW5mby5QTVBhcGVy
-	TmFtZTwva2V5PgoJCTxkaWN0PgoJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQu
-	Y3JlYXRvcjwva2V5PgoJCQk8c3RyaW5nPmNvbS5hcHBsZS5qb2J0aWNrZXQ8L3N0cmlu
-	Zz4KCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0Lml0ZW1BcnJheTwva2V5PgoJ
-	CQk8YXJyYXk+CgkJCQk8ZGljdD4KCQkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC5QYXBl
-	ckluZm8uUE1QYXBlck5hbWU8L2tleT4KCQkJCQk8c3RyaW5nPmlzby1hNDwvc3RyaW5n
-	PgoJCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5zdGF0ZUZsYWc8L2tleT4K
-	CQkJCQk8aW50ZWdlcj4wPC9pbnRlZ2VyPgoJCQkJPC9kaWN0PgoJCQk8L2FycmF5PgoJ
-	CTwvZGljdD4KCQk8a2V5PmNvbS5hcHBsZS5wcmludC5QYXBlckluZm8uUE1VbmFkanVz
-	dGVkUGFnZVJlY3Q8L2tleT4KCQk8ZGljdD4KCQkJPGtleT5jb20uYXBwbGUucHJpbnQu
-	dGlja2V0LmNyZWF0b3I8L2tleT4KCQkJPHN0cmluZz5jb20uYXBwbGUuam9idGlja2V0
-	PC9zdHJpbmc+CgkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5pdGVtQXJyYXk8
-	L2tleT4KCQkJPGFycmF5PgoJCQkJPGRpY3Q+CgkJCQkJPGtleT5jb20uYXBwbGUucHJp
-	bnQuUGFwZXJJbmZvLlBNVW5hZGp1c3RlZFBhZ2VSZWN0PC9rZXk+CgkJCQkJPGFycmF5
-	PgoJCQkJCQk8cmVhbD4wLjA8L3JlYWw+CgkJCQkJCTxyZWFsPjAuMDwvcmVhbD4KCQkJ
-	CQkJPHJlYWw+NzgzPC9yZWFsPgoJCQkJCQk8cmVhbD41NTk8L3JlYWw+CgkJCQkJPC9h
-	cnJheT4KCQkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuc3RhdGVGbGFnPC9r
-	ZXk+CgkJCQkJPGludGVnZXI+MDwvaW50ZWdlcj4KCQkJCTwvZGljdD4KCQkJPC9hcnJh
-	eT4KCQk8L2RpY3Q+CgkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFwZXJJbmZvLlBNVW5h
-	ZGp1c3RlZFBhcGVyUmVjdDwva2V5PgoJCTxkaWN0PgoJCQk8a2V5PmNvbS5hcHBsZS5w
-	cmludC50aWNrZXQuY3JlYXRvcjwva2V5PgoJCQk8c3RyaW5nPmNvbS5hcHBsZS5qb2J0
-	aWNrZXQ8L3N0cmluZz4KCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0Lml0ZW1B
-	cnJheTwva2V5PgoJCQk8YXJyYXk+CgkJCQk8ZGljdD4KCQkJCQk8a2V5PmNvbS5hcHBs
-	ZS5wcmludC5QYXBlckluZm8uUE1VbmFkanVzdGVkUGFwZXJSZWN0PC9rZXk+CgkJCQkJ
-	PGFycmF5PgoJCQkJCQk8cmVhbD4tMTg8L3JlYWw+CgkJCQkJCTxyZWFsPi0xODwvcmVh
-	bD4KCQkJCQkJPHJlYWw+ODI0PC9yZWFsPgoJCQkJCQk8cmVhbD41Nzc8L3JlYWw+CgkJ
-	CQkJPC9hcnJheT4KCQkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuc3RhdGVG
-	bGFnPC9rZXk+CgkJCQkJPGludGVnZXI+MDwvaW50ZWdlcj4KCQkJCTwvZGljdD4KCQkJ
-	PC9hcnJheT4KCQk8L2RpY3Q+CgkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFwZXJJbmZv
-	LnBwZC5QTVBhcGVyTmFtZTwva2V5PgoJCTxkaWN0PgoJCQk8a2V5PmNvbS5hcHBsZS5w
-	cmludC50aWNrZXQuY3JlYXRvcjwva2V5PgoJCQk8c3RyaW5nPmNvbS5hcHBsZS5qb2J0
-	aWNrZXQ8L3N0cmluZz4KCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0Lml0ZW1B
-	cnJheTwva2V5PgoJCQk8YXJyYXk+CgkJCQk8ZGljdD4KCQkJCQk8a2V5PmNvbS5hcHBs
-	ZS5wcmludC5QYXBlckluZm8ucHBkLlBNUGFwZXJOYW1lPC9rZXk+CgkJCQkJPHN0cmlu
-	Zz5BNDwvc3RyaW5nPgoJCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5zdGF0
-	ZUZsYWc8L2tleT4KCQkJCQk8aW50ZWdlcj4wPC9pbnRlZ2VyPgoJCQkJPC9kaWN0PgoJ
-	CQk8L2FycmF5PgoJCTwvZGljdD4KCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQu
-	QVBJVmVyc2lvbjwva2V5PgoJCTxzdHJpbmc+MDAuMjA8L3N0cmluZz4KCQk8a2V5PmNv
-	bS5hcHBsZS5wcmludC50aWNrZXQudHlwZTwva2V5PgoJCTxzdHJpbmc+Y29tLmFwcGxl
-	LnByaW50LlBhcGVySW5mb1RpY2tldDwvc3RyaW5nPgoJPC9kaWN0PgoJPGtleT5jb20u
-	YXBwbGUucHJpbnQudGlja2V0LkFQSVZlcnNpb248L2tleT4KCTxzdHJpbmc+MDAuMjA8
-	L3N0cmluZz4KCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC50eXBlPC9rZXk+Cgk8
-	c3RyaW5nPmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0VGlja2V0PC9zdHJpbmc+Cjwv
-	ZGljdD4KPC9wbGlzdD4KhpKEmZkNTlNSaWdodE1hcmdpboaShKGbrZ4AhpKEmZkWTlNI
-	b3Jpem9udGFsbHlDZW50ZXJlZIaSpJKEmZkVTlNIb3Jpem9uYWxQYWdpbmF0aW9uhpKg
-	koSZmQ1OU0pvYkZlYXR1cmVzhpKElpcAhpKEmZkMTlNMZWZ0TWFyZ2luhpKEoZutngCG
-	koSZmQtOU1RvcE1hcmdpboaShKGbrZ4AhpKEmZkSTlNSZXZlcnNlUGFnZU9yZGVyhpKg
-	koSZmQ5OU0JvdHRvbU1hcmdpboaShKGbrZ4AhpKEmZkKTlNMYXN0UGFnZYaShKGbopeC
-	f////4aShJmZC05TRmlyc3RQYWdlhpKkkoSZmQ1OU09yaWVudGF0aW9uhpKghoY=
-	</data>
+	<key>PrintInfo</key>
+	<dict>
+		<key>NSBottomMargin</key>
+		<array>
+			<string>float</string>
+			<string>18</string>
+		</array>
+		<key>NSHorizonalPagination</key>
+		<array>
+			<string>int</string>
+			<string>0</string>
+		</array>
+		<key>NSJobFeatures</key>
+		<array>
+			<string>coded</string>
+			<string>BAtzdHJlYW10eXBlZIHoA4QBQISEhBNOU011dGFibGVEaWN0aW9uYXJ5AISEDE5TRGljdGlvbmFyeQCEhAhOU09iamVjdACFhAFpAIY=</string>
+		</array>
+		<key>NSLeftMargin</key>
+		<array>
+			<string>float</string>
+			<string>18</string>
+		</array>
+		<key>NSPagesPerSheet</key>
+		<array>
+			<string>int</string>
+			<string>1</string>
+		</array>
+		<key>NSPaperSize</key>
+		<array>
+			<string>size</string>
+			<string>{595, 842}</string>
+		</array>
+		<key>NSPrintAllPages</key>
+		<array>
+			<string>int</string>
+			<string>0</string>
+		</array>
+		<key>NSPrintReverseOrientation</key>
+		<array>
+			<string>int</string>
+			<string>0</string>
+		</array>
+		<key>NSReversePageOrder</key>
+		<array>
+			<string>int</string>
+			<string>0</string>
+		</array>
+		<key>NSRightMargin</key>
+		<array>
+			<string>float</string>
+			<string>18</string>
+		</array>
+		<key>NSTopMargin</key>
+		<array>
+			<string>float</string>
+			<string>41</string>
+		</array>
+	</dict>
+	<key>PrintOnePage</key>
+	<false/>
 	<key>ReadOnly</key>
 	<string>NO</string>
 	<key>RowAlign</key>
@@ -699,24 +993,42 @@
 	<string>YES</string>
 	<key>SmartDistanceGuidesActive</key>
 	<string>YES</string>
+	<key>UniqueID</key>
+	<integer>1</integer>
 	<key>UseEntirePage</key>
 	<true/>
 	<key>VPages</key>
 	<integer>1</integer>
 	<key>WindowInfo</key>
 	<dict>
 		<key>CurrentSheet</key>
-		<string>0</string>
+		<integer>0</integer>
+		<key>ExpandedCanvases</key>
+		<array/>
 		<key>Frame</key>
-		<string>{{823, 408}, {537, 755}}</string>
-		<key>ShowRuler</key>
+		<string>{{823, 399}, {728, 764}}</string>
+		<key>ListView</key>
 		<false/>
-		<key>ShowStatusBar</key>
+		<key>OutlineWidth</key>
+		<integer>142</integer>
+		<key>RightSidebar</key>
+		<false/>
+		<key>Sidebar</key>
 		<true/>
+		<key>SidebarWidth</key>
+		<integer>138</integer>
 		<key>VisibleRegion</key>
-		<string>{{0, 3}, {522, 657}}</string>
+		<string>{{-15, 1}, {590, 670}}</string>
 		<key>Zoom</key>
-		<string>1</string>
+		<real>1</real>
+		<key>ZoomValues</key>
+		<array>
+			<array>
+				<string>Canvas 1</string>
+				<real>1</real>
+				<real>1</real>
+			</array>
+		</array>
 	</dict>
 </dict>
 </plist>
Index: doc/next-tutorial/per-object-mixin.png
===================================================================
diff -u -re1a3b4786ffd146bbc52f4ac2276df3f9bc9122e -rd00b7a9fa608e137faea6e52ded881b871d5c29e
Binary files differ
