diff --git a/PROMS/Volian.Controls.Library/StepItem.cs b/PROMS/Volian.Controls.Library/StepItem.cs
index 28be2243..7090a458 100644
--- a/PROMS/Volian.Controls.Library/StepItem.cs
+++ b/PROMS/Volian.Controls.Library/StepItem.cs
@@ -154,6 +154,7 @@ namespace Volian.Controls.Library
 		void MyContent_Changed(object sender)
 		{
 			// Update the text to reflect the content change
+			MyStepRTB.MyItemInfo.RefreshItemAnnotations();
 			MyStepRTB.MyItemInfo=MyStepRTB.MyItemInfo; // Reset Text
 			SetExpandAndExpander(MyItemInfo);
 			// TODO: Need code to update tabs ? not sure what this is - maybe for
@@ -1283,6 +1284,9 @@ namespace Volian.Controls.Library
 				&& ((ItemInfo)newItemInfo.ActiveParent).Notes.Count > 0)
 				nextItem = MyStepPanel.FindItem(((ItemInfo)newItemInfo.ActiveParent).Notes[0]);
 			// TODO:  May need similar logic if a Table is being added to a step that has substeps
+	 //   else if (fromType == E_FromType.Table && ((ItemInfo)newItemInfo.ActiveParent).Steps != null
+	 //&& ((ItemInfo)newItemInfo.ActiveParent).Steps.Count > 0)
+	 //     nextItem = MyStepPanel.FindItem(((ItemInfo)newItemInfo.ActiveParent).Steps[0]);
 			StepItem newStepItem;
 			switch (fromType)
 			{
diff --git a/PROMS/Volian.Controls.Library/StepRTB.cs b/PROMS/Volian.Controls.Library/StepRTB.cs
index 7fe646ad..80acc806 100644
--- a/PROMS/Volian.Controls.Library/StepRTB.cs
+++ b/PROMS/Volian.Controls.Library/StepRTB.cs
@@ -1806,7 +1806,7 @@ namespace Volian.Controls.Library
 		private RichTextBoxFinds _FindOptions = RichTextBoxFinds.None;
 		public void FindText(string str, bool caseSensitive, bool matchWholeWord, bool reverse)
 		{
-			StepRTB savRTF = new RTF();
+			StepRTB savRTF = new StepRTB();
 			int startpos = SelectionStart + SelectionLength;
 			savRTF.Text = this.Text;