diff --git a/maptutorial/step10/logical/structuredefinition-tright.xml b/maptutorial/step10/logical/structuredefinition-tright.xml
index 0d87def..5e63246 100644
--- a/maptutorial/step10/logical/structuredefinition-tright.xml
+++ b/maptutorial/step10/logical/structuredefinition-tright.xml
@@ -21,7 +21,7 @@
 			<min value="1" />
 			<max value="1" />
 		</element>
-		<element id="TRight.d">
+		<element id="TRight.aa">
 			<path value="TRight.aa" />
 			<min value="0" />
 			<max value="*" />
diff --git a/maptutorial/step10/logical/structuredefinition-trightinner.xml b/maptutorial/step10/logical/structuredefinition-trightinner.xml
index e85defa..4aa41e6 100644
--- a/maptutorial/step10/logical/structuredefinition-trightinner.xml
+++ b/maptutorial/step10/logical/structuredefinition-trightinner.xml
@@ -4,7 +4,7 @@
 		url="http://hl7.org/fhir/StructureDefinition/elementdefinition-namespace">
 		<valueUri value="http://hl7.org/fhir/tutorial" />
 	</extension>
-	<url value="http://hl7.org/fhir/StructureDefinition/TRight" />
+	<url value="http://hl7.org/fhir/StructureDefinition/TRightInner" />
 	<name value="TRightInner" />
 	<status value="draft" />
 	<fhirVersion value="4.0.1" />
@@ -20,7 +20,7 @@
 			<min value="1" />
 			<max value="1" />
 		</element>
-		<element id="TRightInner.d">
+		<element id="TRightInner.aa">
 			<path value="TRightInner.aa" />
 			<min value="0" />
 			<max value="*" />
diff --git a/maptutorial/step3/map/step3b.map b/maptutorial/step3/map/step3b.map
index 5968ef8..a0aeb82 100644
--- a/maptutorial/step3/map/step3b.map
+++ b/maptutorial/step3/map/step3b.map
@@ -6,6 +6,6 @@ uses "http://hl7.org/fhir/StructureDefinition/tutorial-left" alias TLeft as sour
 uses "http://hl7.org/fhir/StructureDefinition/tutorial-right" alias TRight as target
 
 group tutorial(source src : TLeft, target tgt : TRight) {
-  src.a2 as a where a2.length()<20 -> tgt.a2 = a "rule_a20b";
+  src.a2 as a where (a.length()<20) -> tgt.a2 = a "rule_a20b";
 }
 
diff --git a/maptutorial/step3/map/step3c.map b/maptutorial/step3/map/step3c.map
index e0390b8..77e8703 100644
--- a/maptutorial/step3/map/step3c.map
+++ b/maptutorial/step3/map/step3c.map
@@ -6,6 +6,6 @@ uses "http://hl7.org/fhir/StructureDefinition/tutorial-left" alias TLeft as sour
 uses "http://hl7.org/fhir/StructureDefinition/tutorial-right" alias TRight as target
 
 group tutorial(source src : TLeft, target tgt : TRight) {
-  src.a2 as a check a2.length()<=20 -> tgt.a2 = a "rule_a20c";
+  src.a2 as a check (a.length()<=20) -> tgt.a2 = a "rule_a20c";
 }
 
diff --git a/maptutorial/step4/map/steb4b.xml b/maptutorial/step4/map/steb4b.xml
deleted file mode 100644
index 007b5b2..0000000
--- a/maptutorial/step4/map/steb4b.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<StructureMap xmlns="http://hl7.org/fhir">
-    <id value="tutorial-step4b" />
-    <url value="http://hl7.org/fhir/StructureMap/tutorial-step4b" />
-    <name value="tutorial-step4b" />
-    <title value="tutorial-step4b" />
-    <status value="draft" />
-    <structure>
-        <url value="http://hl7.org/fhir/StructureDefinition/tutorial-left" />
-        <mode value="source" />
-    </structure>
-    <structure>
-        <url value="http://hl7.org/fhir/StructureDefinition/tutorial-right" />
-        <mode value="target" />
-    </structure>
-    <group>
-        <name value="tutorial" />
-        <typeMode value="none" />
-        <input>
-            <name value="src" />
-            <type value="TLeft" />
-            <mode value="source" />
-        </input>
-        <input>
-            <name value="tgt" />
-            <type value="TRight" />
-            <mode value="target" />
-        </input>
-        <rule>
-            <name value="rule_a21b" />
-            <source>
-                <context value="src" />
-                <element value="a21" />
-                <variable value="a" />
-                <condition value="a21.toInteger()" />
-            </source>
-            <target>
-                <context value="tgt" />
-                <contextType value="variable" />
-                <element value="a21" />
-                <transform value="copy" />
-                <parameter>
-                    <valueId value="a" />
-                </parameter>
-            </target>
-        </rule>
-    </group>
-</StructureMap>
\ No newline at end of file
diff --git a/maptutorial/step4/map/step4a.map b/maptutorial/step4/map/step4a.map
index 64235b5..2690e91 100644
--- a/maptutorial/step4/map/step4a.map
+++ b/maptutorial/step4/map/step4a.map
@@ -6,5 +6,5 @@ uses "http://hl7.org/fhir/StructureDefinition/tutorial-left" alias TLeft as sour
 uses "http://hl7.org/fhir/StructureDefinition/tutorial-right" alias TRight as target
 
 group tutorial(source src : TLeft, target tgt : TRight) {
-  src.a21 as a -> tgt.a21 = cast(a, 'FHIR.integer') "rule_a21a";
+  src.a21 as a -> tgt.a21 = cast(a, 'integer') "rule_a21a";
 }
\ No newline at end of file