diff --git a/lib/nodes/RSL/ColorCorrect/gammaCC.xml b/lib/nodes/RSL/ColorCorrect/gamma/gammaCC.xml
similarity index 100%
rename from lib/nodes/RSL/ColorCorrect/gammaCC.xml
rename to lib/nodes/RSL/ColorCorrect/gamma/gammaCC.xml
diff --git a/lib/nodes/RSL/ColorCorrect/gammaCF.xml b/lib/nodes/RSL/ColorCorrect/gamma/gammaCF.xml
similarity index 100%
rename from lib/nodes/RSL/ColorCorrect/gammaCF.xml
rename to lib/nodes/RSL/ColorCorrect/gamma/gammaCF.xml
diff --git a/lib/nodes/RSL/ColorCorrect/gammaCF_mask.xml b/lib/nodes/RSL/ColorCorrect/gamma/gammaCF_mask.xml
similarity index 100%
rename from lib/nodes/RSL/ColorCorrect/gammaCF_mask.xml
rename to lib/nodes/RSL/ColorCorrect/gamma/gammaCF_mask.xml
diff --git a/lib/nodes/RSL/ColorCorrect/gammaColorColor.png b/lib/nodes/RSL/ColorCorrect/gamma/gammaColorColor.png
similarity index 100%
rename from lib/nodes/RSL/ColorCorrect/gammaColorColor.png
rename to lib/nodes/RSL/ColorCorrect/gamma/gammaColorColor.png
diff --git a/lib/nodes/RSL/ColorCorrect/gammaColorFloat.png b/lib/nodes/RSL/ColorCorrect/gamma/gammaColorFloat.png
similarity index 100%
rename from lib/nodes/RSL/ColorCorrect/gammaColorFloat.png
rename to lib/nodes/RSL/ColorCorrect/gamma/gammaColorFloat.png
diff --git a/lib/nodes/RSL/ColorCorrect/gammaF.xml b/lib/nodes/RSL/ColorCorrect/gamma/gammaF.xml
similarity index 100%
rename from lib/nodes/RSL/ColorCorrect/gammaF.xml
rename to lib/nodes/RSL/ColorCorrect/gamma/gammaF.xml
diff --git a/lib/nodes/RSL/ColorCorrect/gammaFloat.png b/lib/nodes/RSL/ColorCorrect/gamma/gammaFloat.png
similarity index 100%
rename from lib/nodes/RSL/ColorCorrect/gammaFloat.png
rename to lib/nodes/RSL/ColorCorrect/gamma/gammaFloat.png
diff --git a/lib/nodes/RSL/ColorCorrect/gradeCC.xml b/lib/nodes/RSL/ColorCorrect/grade/gradeFromCC.xml
similarity index 89%
rename from lib/nodes/RSL/ColorCorrect/gradeCC.xml
rename to lib/nodes/RSL/ColorCorrect/grade/gradeFromCC.xml
index cdc67ab..ffbc166 100644
--- a/lib/nodes/RSL/ColorCorrect/gradeCC.xml
+++ b/lib/nodes/RSL/ColorCorrect/grade/gradeFromCC.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<node name="gradeCC" label="gradeCC" author="DRL">
+<node name="gradeFromCC" label="gradeCC" author="DRL">
 	<help>Remap color in [0-1] range to new value between defined min and max.</help>
 	<input>
 		<property name="input" type="color" default="color(0)"/>
diff --git a/lib/nodes/RSL/ColorCorrect/gradeF.xml b/lib/nodes/RSL/ColorCorrect/grade/gradeFromF.xml
similarity index 90%
rename from lib/nodes/RSL/ColorCorrect/gradeF.xml
rename to lib/nodes/RSL/ColorCorrect/grade/gradeFromF.xml
index ae7adbb..4b08344 100644
--- a/lib/nodes/RSL/ColorCorrect/gradeF.xml
+++ b/lib/nodes/RSL/ColorCorrect/grade/gradeFromF.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<node name="gradeF" label="gradeF" author="DRL">
+<node name="gradeFromF" label="gradeF" author="DRL">
 	<help>Remap float value in [0-1] range to new min and max.</help>
 	<input>
 		<property name="input" type="float" default="0"/>
diff --git a/lib/nodes/RSL/ColorCorrect/gradeFC.xml b/lib/nodes/RSL/ColorCorrect/grade/gradeFromFC.xml
similarity index 89%
rename from lib/nodes/RSL/ColorCorrect/gradeFC.xml
rename to lib/nodes/RSL/ColorCorrect/grade/gradeFromFC.xml
index 1d33d09..de30729 100644
--- a/lib/nodes/RSL/ColorCorrect/gradeFC.xml
+++ b/lib/nodes/RSL/ColorCorrect/grade/gradeFromFC.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<node name="gradeFC" label="gradeFC" author="DRL">
+<node name="gradeFromFC" label="gradeFC" author="DRL">
 	<help>Remap float value in [0-1] range to color between new min and max.</help>
 	<input>
 		<property name="input" type="float" default="0"/>
diff --git a/lib/nodes/RSL/operation/remapF.xml b/lib/nodes/RSL/ColorCorrect/grade/gradeFullF.xml
similarity index 83%
rename from lib/nodes/RSL/operation/remapF.xml
rename to lib/nodes/RSL/ColorCorrect/grade/gradeFullF.xml
index aa7e43a..f4a2916 100644
--- a/lib/nodes/RSL/operation/remapF.xml
+++ b/lib/nodes/RSL/ColorCorrect/grade/gradeFullF.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> 
 
-<node name="remapF" author="Pixar">
+<node name="gradeFullF" author="Pixar">
 	<help>Remap float value	</help>
 	<input>
 	  <property name="input" type="float" default="0" subtype="slider" range="0 1.0 .01"/>	
@@ -16,7 +16,7 @@
 <![CDATA[
 	$(result) = clamp($(input), $(inputmin), $(inputmax) );
 	$(result) = $(outputmin) + 
-	          ($(outputmax) - $(outputmin)) * ($(result) - $(inputmin)) / ($(inputmax) - $(inputmin));
-	]]>
+		($(outputmax) - $(outputmin)) * ($(result) - $(inputmin)) / ($(inputmax) - $(inputmin));
+]]>
 	</code>		
 </node>
diff --git a/lib/nodes/RSL/ColorCorrect/grade/gradeToF.xml b/lib/nodes/RSL/ColorCorrect/grade/gradeToF.xml
new file mode 100644
index 0000000..cce73ff
--- /dev/null
+++ b/lib/nodes/RSL/ColorCorrect/grade/gradeToF.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+
+<node name="gradeToF" label="gradeToF" author="DRL">
+	<help>Remap float value from min and max to [0-1] range.</help>
+	<input>
+		<property name="input" type="float" default="0"/>
+		<property name="min" type="float" default="0" detail="uniform"
+			subtype="slider"
+			range="0 1 .01"/>
+		<property name="max" type="float" default="1" detail="uniform"
+			subtype="slider"
+			range="0 1 .01"/>
+	</input>
+	<output>
+		<property name="result" type="float"/>
+	</output>
+	<code><![CDATA[
+
+$(result) = ( $(input) - $(min) ) / ( $(max) - $(min) );
+]]>
+	</code>
+</node>
\ No newline at end of file
diff --git a/lib/nodes/RSL/ColorCorrect/saturation.xml b/lib/nodes/RSL/ColorCorrect/saturation.xml
index 1b7a374..92c3b41 100644
--- a/lib/nodes/RSL/ColorCorrect/saturation.xml
+++ b/lib/nodes/RSL/ColorCorrect/saturation.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?> 
 
 <node name="saturation" author="mesh">
-	<help>Controls the color sauration value</help>
+	<help>Controls the color saturation value</help>
 	<input>
 	  <property name="input" type="color" default="color(0,0,0)"/>
 	  <property name="value" type="float" default="1" subtype="slider" range="0 1 0.01"/>
diff --git a/lib/nodes/RSL/displacement.xml b/lib/nodes/RSL/displacement.xml
index e1ca7ab..a9f3364 100644
--- a/lib/nodes/RSL/displacement.xml
+++ b/lib/nodes/RSL/displacement.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?> 
-<node name="displace" type="displacement" author="mesh">
+<node name="displacement" label="disp" type="displacement" author="mesh">
 	<help>Root displacement shader.</help>
 	<input>
 		<property name="P" type="point" default="point (0.0, 0.0, 0.0)" />
diff --git a/lib/nodes/RSL/globals/(aovs)/DRL/iColor.xml b/lib/nodes/RSL/globals/(aovs)/DRL/iColor.xml
index 8c2ef60..1e92dd3 100644
--- a/lib/nodes/RSL/globals/(aovs)/DRL/iColor.xml
+++ b/lib/nodes/RSL/globals/(aovs)/DRL/iColor.xml
@@ -4,18 +4,23 @@
 	<help>This node produces "i_color" AOV. 
 	ATTENTION: you really don't want to use this node more then once in any shader.</help>
 	<input>
+		<property name="input" type="color" default="color(0)">
+			<help>Any color component used just for connecting this node to shader network.</help>
+		</property>
 		<property name="mnClr" type="color" default="color(0)">
 			<help>Main color AOV.</help>
 		</property>
 	</input>
 	
 	<output>
+		<property detail="varying" name="output" type="color"/>
 		<property detail="varying" provider="primitive" name="i_color" type="color" default="color(0)"/>
 	</output>
 	
 	<code><![CDATA[
 
 i_color = $(mnClr);
+$(output) = $(input);
 
 ]]>
 	</code>
diff --git a/lib/nodes/RSL/globals/(aovs)/DRL/iDiffInd.xml b/lib/nodes/RSL/globals/(aovs)/DRL/iDiffInd.xml
index f23e1b6..c81495f 100644
--- a/lib/nodes/RSL/globals/(aovs)/DRL/iDiffInd.xml
+++ b/lib/nodes/RSL/globals/(aovs)/DRL/iDiffInd.xml
@@ -4,18 +4,23 @@
 	<help>This node produces "i_diff_ind" AOV. 
 	ATTENTION: you really don't want to use this node more then once in any shader.</help>
 	<input>
+		<property name="input" type="color" default="color(0)">
+			<help>Any color component used just for connecting this node to shader network.</help>
+		</property>
 		<property name="diffInd" type="color" default="color(0)">
 			<help>Indirect diffuse AOV.</help>
 		</property>
 	</input>
 	
 	<output>
+		<property detail="varying" name="output" type="color"/>
 		<property detail="varying" provider="primitive" name="i_diff_ind" type="color" default="color(0)"/>
 	</output>
 	
 	<code><![CDATA[
 
 i_diff_ind = $(diffInd);
+$(output) = $(input);
 
 ]]>
 	</code>
diff --git a/lib/nodes/RSL/globals/(aovs)/DRL/iEnv.xml b/lib/nodes/RSL/globals/(aovs)/DRL/iEnv.xml
index d5bcf3a..cb90ba5 100644
--- a/lib/nodes/RSL/globals/(aovs)/DRL/iEnv.xml
+++ b/lib/nodes/RSL/globals/(aovs)/DRL/iEnv.xml
@@ -4,18 +4,23 @@
 	<help>This node produces "i_env" AOV. 
 	ATTENTION: you really don't want to use this node more then once in any shader.</help>
 	<input>
+		<property name="input" type="color" default="color(0)">
+			<help>Any color component used just for connecting this node to shader network.</help>
+		</property>
 		<property name="env" type="color" default="color(0)">
 			<help>Environment AOV.</help>
 		</property>
 	</input>
 	
 	<output>
+		<property detail="varying" name="output" type="color"/>
 		<property detail="varying" provider="primitive" name="i_env" type="color" default="color(0)"/>
 	</output>
 	
 	<code><![CDATA[
 
 i_env = $(env);
+$(output) = $(input);
 
 ]]>
 	</code>
diff --git a/lib/nodes/RSL/globals/(aovs)/DRL/iReflection.xml b/lib/nodes/RSL/globals/(aovs)/DRL/iReflection.xml
index 1a07d99..7045cc0 100644
--- a/lib/nodes/RSL/globals/(aovs)/DRL/iReflection.xml
+++ b/lib/nodes/RSL/globals/(aovs)/DRL/iReflection.xml
@@ -4,18 +4,23 @@
 	<help>This node produces "i_reflection" AOV. 
 	ATTENTION: you really don't want to use this node more then once in any shader.</help>
 	<input>
+		<property name="input" type="color" default="color(0)">
+			<help>Any color component used just for connecting this node to shader network.</help>
+		</property>
 		<property name="refl" type="color" default="color(0)">
 			<help>Reflection AOV.</help>
 		</property>
 	</input>
 	
 	<output>
+		<property detail="varying" name="output" type="color"/>
 		<property detail="varying" provider="primitive" name="i_reflection" type="color" default="color(0)"/>
 	</output>
 	
 	<code><![CDATA[
 
 i_reflection = $(refl);
+$(output) = $(input);
 
 ]]>
 	</code>
diff --git a/lib/nodes/RSL/globals/(aovs)/DRL/iSpec.xml b/lib/nodes/RSL/globals/(aovs)/DRL/iSpec.xml
index 5e380d8..3484da2 100644
--- a/lib/nodes/RSL/globals/(aovs)/DRL/iSpec.xml
+++ b/lib/nodes/RSL/globals/(aovs)/DRL/iSpec.xml
@@ -4,18 +4,23 @@
 	<help>This node produces "i_spec" AOV. 
 	ATTENTION: you really don't want to use this node more then once in any shader.</help>
 	<input>
+		<property name="input" type="color" default="color(0)">
+			<help>Any color component used just for connecting this node to shader network.</help>
+		</property>
 		<property name="spec" type="color" default="color(0)">
 			<help>Specular AOV.</help>
 		</property>
 	</input>
 	
 	<output>
+		<property detail="varying" name="output" type="color"/>
 		<property detail="varying" provider="primitive" name="i_spec" type="color" default="color(0)"/>
 	</output>
 	
 	<code><![CDATA[
 
 i_spec = $(spec);
+$(output) = $(input);
 
 ]]>
 	</code>
diff --git a/lib/nodes/RSL/globals/(aovs)/DRL/rflAmount.xml b/lib/nodes/RSL/globals/(aovs)/DRL/rflAmount.xml
index 1e60d79..3baacfb 100644
--- a/lib/nodes/RSL/globals/(aovs)/DRL/rflAmount.xml
+++ b/lib/nodes/RSL/globals/(aovs)/DRL/rflAmount.xml
@@ -4,18 +4,23 @@
 	<help>This node produces "rfl_amount" AOV. 
 	ATTENTION: you really don't want to use this node more then once in any shader.</help>
 	<input>
+		<property name="input" type="color" default="color(0)">
+			<help>Any color component used just for connecting this node to shader network.</help>
+		</property>
 		<property name="rflAmt" type="float" default="0">
 			<help>Reflection Amount AOV.</help>
 		</property>
 	</input>
 	
 	<output>
+		<property detail="varying" name="output" type="color"/>
 		<property detail="varying" provider="primitive" name="rfl_amount" type="float" default="0"/>
 	</output>
 	
 	<code><![CDATA[
 
 rfl_amount = $(rflAmt);
+$(output) = $(input);
 
 ]]>
 	</code>
diff --git a/lib/nodes/RSL/globals/(aovs)/DRL/rflTint.xml b/lib/nodes/RSL/globals/(aovs)/DRL/rflTint.xml
index e3402fd..43c5095 100644
--- a/lib/nodes/RSL/globals/(aovs)/DRL/rflTint.xml
+++ b/lib/nodes/RSL/globals/(aovs)/DRL/rflTint.xml
@@ -4,18 +4,23 @@
 	<help>This node produces "rfl_tint" AOV. 
 	ATTENTION: you really don't want to use this node more then once in any shader.</help>
 	<input>
+		<property name="input" type="color" default="color(0)">
+			<help>Any color component used just for connecting this node to shader network.</help>
+		</property>
 		<property name="rflTint" type="color" default="color(0)">
 			<help>Reflection Tint AOV.</help>
 		</property>
 	</input>
 	
 	<output>
+		<property detail="varying" name="output" type="color"/>
 		<property detail="varying" provider="primitive" name="rfl_tint" type="color" default="color(0)"/>
 	</output>
 	
 	<code><![CDATA[
 
 rfl_tint = $(rflTint);
+$(output) = $(input);
 
 ]]>
 	</code>
diff --git a/lib/nodes/RSL/surface_noOiAffect.xml b/lib/nodes/RSL/surface_noOiAffect.xml
new file mode 100644
index 0000000..9e64439
--- /dev/null
+++ b/lib/nodes/RSL/surface_noOiAffect.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?> 
+
+<node name="surface_noOiAffect" label="surf" type="surface" author="mesh">
+	<help>Basic surface shader allowing to set exact Ci, not affected by Oi.</help>
+	<input>
+		<property name="Ci" type="color" default="color(0.0, 0.0, 0.0)" />
+		<property name="Oi" type="color" default="color(1.0, 1.0, 1.0)" />
+	</input>
+	<output>
+	  <property name="surface" type="rib" default="Surface &quot;${NODELABEL}&quot;" />
+	</output>
+	<code><![CDATA[
+#define SURFACE_SHADER ${INSTANCENAME}
+surface ${INSTANCENAME} ( 
+${PARAMS} 
+)
+{
+  /* CODE BEGIN ${INSTANCENAME} */
+  Ci = $(Ci); 
+  Oi = $(Oi);
+  /* CODE END ${INSTANCENAME} */
+}
+	]]>
+	</code>
+</node>
\ No newline at end of file
diff --git a/lib/nodes/RSL/types/conversion/colorToNormal.xml b/lib/nodes/RSL/types/conversion/colorToNormal.xml
index 82d7f2d..cf7f2b3 100644
--- a/lib/nodes/RSL/types/conversion/colorToNormal.xml
+++ b/lib/nodes/RSL/types/conversion/colorToNormal.xml
@@ -6,10 +6,10 @@
 		<property name="inC" type="color" default="color(0)" />
 	</input>
 	<output>
-		<property name="outN type="normal" />
+		<property name="outN" type="normal" />
 	</output>
 	<code><![CDATA[
-$(outP) = normal($(inC));
+$(outN) = normal($(inC));
 ]]>
 	</code>
 </node>
\ No newline at end of file
diff --git a/lib/nodes/RSL/types/file.xml b/lib/nodes/RSL/types/file.xml
index 4bca0ed..2524737 100644
--- a/lib/nodes/RSL/types/file.xml
+++ b/lib/nodes/RSL/types/file.xml
@@ -4,14 +4,14 @@
 	<help>Dummy string file parameter. 
 	Useful for connecting filename inputs (such as envMap) from the other nodes to a single value.</help>
 	<input>
-		<property name="file" type="string" default="" detail="uniform" subtype="file"/>
+		<property name="fl" type="string" default="" detail="uniform" subtype="file"/>
 	</input>
 	<output>
 		<property name="output" type="string" detail="uniform"/>
 	</output>
 	<code><![CDATA[
 
-$(output) = $(file);
+$(output) = $(fl);
 	]]>
 	</code>
 </node>
\ No newline at end of file
diff --git a/lib/nodes/RSL/types/float.xml b/lib/nodes/RSL/types/float.xml
index 76d6a47..f762061 100644
--- a/lib/nodes/RSL/types/float.xml
+++ b/lib/nodes/RSL/types/float.xml
@@ -4,14 +4,14 @@
 	<help>Dummy float parameter. 
 	Useful for connecting float inputs from the other nodes to a single value.</help>
 	<input>
-		<property name="float" type="float" default="0" detail="uniform"/>
+		<property name="F" type="float" default="0" detail="uniform"/>
 	</input>
 	<output>
 		<property name="output" type="float" detail="uniform"/>
 	</output>
 	<code><![CDATA[
 
-$(output) = $(float);
+$(output) = $(F);
 	]]>
 	</code>
 </node>
\ No newline at end of file
diff --git a/lib/nodes/RSL/types/string.xml b/lib/nodes/RSL/types/string.xml
index 2384e69..d70e454 100644
--- a/lib/nodes/RSL/types/string.xml
+++ b/lib/nodes/RSL/types/string.xml
@@ -4,14 +4,14 @@
 	<help>Dummy string parameter. 
 	Useful for connecting string inputs (such as coordSpace) from the other nodes to a single value.</help>
 	<input>
-		<property name="string" type="string" default="" detail="uniform"/>
+		<property name="S" type="string" default="" detail="uniform"/>
 	</input>
 	<output>
 		<property name="output" type="string" detail="uniform"/>
 	</output>
 	<code><![CDATA[
 
-$(output) = $(string);
+$(output) = $(S);
 	]]>
 	</code>
 </node>
\ No newline at end of file
diff --git a/lib/nodes/RSL/types/switch.xml b/lib/nodes/RSL/types/switch.xml
index 2a62d36..967b64b 100644
--- a/lib/nodes/RSL/types/switch.xml
+++ b/lib/nodes/RSL/types/switch.xml
@@ -4,14 +4,14 @@
 	<help>Dummy float switch. 
 	Useful for connecting switch inputs from the other nodes to a single value.</help>
 	<input>
-		<property name="switch" type="float" default="0" detail="uniform" subtype="switch"/>
+		<property name="sw" type="float" default="0" detail="uniform" subtype="switch"/>
 	</input>
 	<output>
 		<property name="output" type="float" detail="uniform"/>
 	</output>
 	<code><![CDATA[
 
-$(output) = $(switch);
+$(output) = $(sw);
 	]]>
 	</code>
 </node>
\ No newline at end of file
diff --git a/lib/nodes/RSL/utilites/NormalMapSpace.xml b/lib/nodes/RSL/utilites/NormalMapSpace.xml
new file mode 100644
index 0000000..e20e907
--- /dev/null
+++ b/lib/nodes/RSL/utilites/NormalMapSpace.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?> 
+
+<node name="NormalMapSpace" label="nmS" author="DRL">
+	<help>Normalmap texture in custom space.</help>
+	
+	<input>
+		<property name="N" type="normal" default="normal (0, 1, 0)">
+			<help>Normal vector.</help>
+		</property>
+		<property name="sourceSpace" type="string" default="current" detail="uniform">
+			<help>The space that incoming N vector is in.</help>
+		</property>
+		<property name="bakeSpace" type="string" default="object" detail="uniform">
+			<help>The space to calculate normal map for.</help>
+		</property>
+	</input>
+	
+	<output>
+		<property detail="varying" name="NM" type="color"/>
+	</output>
+	
+	<code><![CDATA[
+
+// code begin - NormalMapSpace
+$(NM) = color( normalize( transform( $(sourceSpace), $(bakeSpace), $(N) )));
+$(NM) = ( $(NM) + color(1) ) / 2; // grade NM to [0-1] color range
+$(NM) = clamp( $(NM), color(0), color(1) );
+// code end - NormalMapSpace
+]]>
+	</code>
+</node>
\ No newline at end of file