--- a/examples/example.xml	Wed Oct 24 17:40:04 2007 +0200
+++ b/examples/example.xml	Fri Oct 26 10:25:01 2007 +0200
@@ -252,7 +252,7 @@
                 <relPosition y="60" x="2"/>
               </connectionPointOut>
             </leftPowerRail>
-            <coil localId="3" width="21" storage="none" height="15" negated="false">
+            <coil localId="3" width="21" height="15">
               <position y="72" x="265"/>
               <connectionPointIn>
                 <relPosition y="8" x="0"/>
@@ -276,7 +276,7 @@
                 </connection>
               </connectionPointIn>
             </rightPowerRail>
-            <contact localId="5" width="21" height="15" edge="none" negated="true">
+            <contact localId="5" width="21" height="15" negated="true">
               <position y="72" x="42"/>
               <connectionPointIn>
                 <relPosition y="8" x="0"/>
@@ -290,7 +290,7 @@
               </connectionPointOut>
               <variable>IN1</variable>
             </contact>
-            <contact localId="7" width="21" height="15" edge="none" negated="false">
+            <contact localId="7" width="21" height="15">
               <position y="72" x="174"/>
               <connectionPointIn>
                 <relPosition y="8" x="0"/>
@@ -310,7 +310,7 @@
               </connectionPointOut>
               <variable>IN2</variable>
             </contact>
-            <contact localId="8" width="21" height="15" edge="none" negated="false">
+            <contact localId="8" width="21" height="15">
               <position y="112" x="42"/>
               <connectionPointIn>
                 <relPosition y="8" x="0"/>
@@ -324,7 +324,7 @@
               </connectionPointOut>
               <variable>IN3</variable>
             </contact>
-            <contact localId="9" width="21" height="15" edge="none" negated="true">
+            <contact localId="9" width="21" height="15" negated="true">
               <position y="112" x="93"/>
               <connectionPointIn>
                 <relPosition y="8" x="0"/>
@@ -549,7 +549,7 @@
                     <relPosition y="64" x="2"/>
                   </connectionPointOut>
                 </leftPowerRail>
-                <contact localId="2" width="21" height="15" edge="none" negated="false">
+                <contact localId="2" width="21" height="15">
                   <position y="32" x="72"/>
                   <connectionPointIn>
                     <relPosition y="8" x="0"/>
@@ -563,7 +563,7 @@
                   </connectionPointOut>
                   <variable>IN2</variable>
                 </contact>
-                <contact localId="3" width="21" height="15" edge="rising" negated="false">
+                <contact localId="3" width="21" height="15" edge="rising">
                   <position y="76" x="72"/>
                   <connectionPointIn>
                     <relPosition y="8" x="0"/>
@@ -577,7 +577,7 @@
                   </connectionPointOut>
                   <variable>IN5</variable>
                 </contact>
-                <coil localId="4" width="21" storage="none" height="15" negated="true">
+                <coil localId="4" width="21" height="15" negated="true">
                   <position y="32" x="208"/>
                   <connectionPointIn>
                     <relPosition y="8" x="0"/>
@@ -645,7 +645,7 @@
                 <reference name="TR1"/>
               </condition>
             </transition>
-            <step localId="3" height="27" width="29" initialStep="false" name="Init">
+            <step localId="3" height="27" width="29" name="Init">
               <position y="129" x="91"/>
               <connectionPointIn>
                 <relPosition y="0" x="14"/>
@@ -698,7 +698,7 @@
                 </inline>
               </condition>
             </transition>
-            <step localId="6" height="27" width="48" initialStep="false" name="Step1">
+            <step localId="6" height="27" width="48" name="Step1">
               <position y="262" x="81"/>
               <connectionPointIn>
                 <relPosition y="0" x="24"/>
@@ -727,7 +727,7 @@
                 <reference name="TR2"/>
               </condition>
             </transition>
-            <step localId="8" height="27" width="48" initialStep="false" name="Step2">
+            <step localId="8" height="27" width="48" name="Step2">
               <position y="234" x="309"/>
               <connectionPointIn>
                 <relPosition y="0" x="24"/>
@@ -756,7 +756,7 @@
                 <reference name="TR4"/>
               </condition>
             </transition>
-            <step localId="10" height="27" width="48" initialStep="false" name="Step3">
+            <step localId="10" height="27" width="48" name="Step3">
               <position y="234" x="472"/>
               <connectionPointIn>
                 <relPosition y="0" x="24"/>
@@ -807,7 +807,7 @@
                   <position y="142" x="120"/>
                 </connection>
               </connectionPointIn>
-              <action qualifier="N">
+              <action>
                 <reference name="ACT1"/>
               </action>
             </actionBlock>
@@ -886,7 +886,7 @@
                   <position y="247" x="520"/>
                 </connection>
               </connectionPointIn>
-              <action indicator="IN5" qualifier="N">
+              <action indicator="IN5">
                 <reference name="ACT1"/>
               </action>
               <action qualifier="D" duration="T#10s">
@@ -914,7 +914,7 @@
                 <relPosition y="3" x="118"/>
               </connectionPointOut>
             </simultaneousDivergence>
-            <step localId="22" height="27" width="48" initialStep="false" name="Step4">
+            <step localId="22" height="27" width="48" name="Step4">
               <position y="262" x="199"/>
               <connectionPointIn>
                 <relPosition y="0" x="24"/>