diff --git a/trunk/Helpers/LSL2CSharp.cs b/trunk/Helpers/LSL2CSharp.cs
index 83ab770..cf8f33c 100644
--- a/trunk/Helpers/LSL2CSharp.cs
+++ b/trunk/Helpers/LSL2CSharp.cs
@@ -175,7 +175,7 @@ namespace LSLEditor
 
 			// State change, excluding global functions
 			regex = new Regex(
-				@"(\s+)state\s+(\w*)(\s*;)",
+				@"(\s+)state\s+(\w+)(\s*;)",
 				RegexOptions.IgnorePatternWhitespace
 				| RegexOptions.Compiled
 				);
diff --git a/trunk/Resource/ReleaseNotes.htm b/trunk/Resource/ReleaseNotes.htm
index 25a5785..2feab3e 100644
--- a/trunk/Resource/ReleaseNotes.htm
+++ b/trunk/Resource/ReleaseNotes.htm
@@ -11,15 +11,19 @@
 					<li>"Release Notes..." to help menu.</li>
 				</ul>
 
-				- Updated
+				* Changed
 				<ul>
-					<li>About.htm</li>
+					<li>Updated About.htm</li>
+					<li>Tools => Options => Text Editor => General - Changed labels to properly reflect the output file format.</li>
+					<li>UTF-8 output no longer prefixes the B.O.M. character.</li>
+					<li>UTF-8 is now the default file output format. ANSI is deprecated and will be removed at a later date.</li>
 				</ul>
 
-				- Fixed:
+				* Fixed:
 				<ul>
 					<li>2995296 - Search | Comment Line (Ctl+K) Breaks Line After Search Term</li>
 					<li>3461546 - ReleaseNotes.htm in source, but never used</li>
+					<li>no id - Fix for state change without state name passing syntax-check.</li>
 					<li>3465488 - lslint does not show errors.</li>
 				</ul>
 			</div>
@@ -143,13 +147,13 @@
 
 			<div>
 				<h3><u>2011-04-21</u> - Release 2.42</h3>
-				- Added: constants
+				* Added: constants
 				<ul>
 					<li>CHANGED_REGION_START</li>
 					<li>PRIM_DESC</li>
 					<li>PRIM_NAME</li>
 				</ul>
-				- Added: functions (highlighting only):
+				* Added: functions (highlighting only):
 				<ul>
 					<li>llCastRay</li>
 					<li>llGetLinkNumberOfSides</li>
diff --git a/trunk/Tools/TextEditorGeneral.Designer.cs b/trunk/Tools/TextEditorGeneral.Designer.cs
index 7506554..adbb39d 100644
--- a/trunk/Tools/TextEditorGeneral.Designer.cs
+++ b/trunk/Tools/TextEditorGeneral.Designer.cs
@@ -224,7 +224,7 @@ namespace LSLEditor.Tools
 			this.radioButton6.Size = new System.Drawing.Size(65, 17);
 			this.radioButton6.TabIndex = 1;
 			this.radioButton6.TabStop = true;
-			this.radioButton6.Text = "Unicode";
+			this.radioButton6.Text = "UTF-16 LE";
 			this.radioButton6.UseVisualStyleBackColor = true;
 			// 
 			// radioButton7
@@ -235,7 +235,7 @@ namespace LSLEditor.Tools
 			this.radioButton7.Size = new System.Drawing.Size(117, 17);
 			this.radioButton7.TabIndex = 2;
 			this.radioButton7.TabStop = true;
-			this.radioButton7.Text = "Unicode big endian";
+			this.radioButton7.Text = "UTF-16 BE";
 			this.radioButton7.UseVisualStyleBackColor = true;
 			// 
 			// radioButton8