diff --git a/questtypes/textinput/TextinputQuesttypeController.inc b/questtypes/textinput/TextinputQuesttypeController.inc
index f9e9c85a..3255d30d 100644
--- a/questtypes/textinput/TextinputQuesttypeController.inc
+++ b/questtypes/textinput/TextinputQuesttypeController.inc
@@ -215,7 +215,6 @@
 					{
 						// Validate regex
 						$regex = $field['regex'];
-						//$fieldValidation = $this->Validation->validate($regex, \nre\configs\AppConfig::$validation['regex']);
 						$fieldValidation = @preg_match($regex, '') !== false;
 						if($fieldValidation !== true)
 						{
diff --git a/questtypes/textinput/TextinputQuesttypeModel.inc b/questtypes/textinput/TextinputQuesttypeModel.inc
index daf0edde..b503701d 100644
--- a/questtypes/textinput/TextinputQuesttypeModel.inc
+++ b/questtypes/textinput/TextinputQuesttypeModel.inc
@@ -119,7 +119,7 @@
 		 * 
 		 * @param	int	$userId		ID of user setting text
 		 * @param	int	$questId	ID of Quest to set text for
-		 * @param	string	$text		Text for Quset
+		 * @param	string	$text		Text for Quest
 		 */
 		public function setTextForQuest($userId, $questId, $text)
 		{
diff --git a/questtypes/textinput/html/edittask.tpl b/questtypes/textinput/html/edittask.tpl
index f7b99513..209863d7 100644
--- a/questtypes/textinput/html/edittask.tpl
+++ b/questtypes/textinput/html/edittask.tpl
@@ -22,7 +22,7 @@
 <form method="post">
 	<fieldset>
 		<legend><?=_('Text')?></legend>
-		<button id="add-field"><?=_('Add field')?></button><br />
+		<button id="add-field" type="button"><?=_('Add field')?></button><br />
 		<textarea id="text" name="text"><?=$text?></textarea>
 	</fieldset>
 	<fieldset>
@@ -62,7 +62,7 @@
 		'<option value="<?=$size['size']?>"><?=$size['size']?></option>' +
 		<?php endforeach ?>
 		'</select>';
-	var inputElement = '<input type="text" name="fields[INDEX][regex]" />';
+	var inputElement = '<input type="text" name="fields[INDEX][regex]" required="required" placeholder="/regex/i" />';
 	$("#add-field").click(function(event) {
 		event.preventDefault();
 		var caret = getCaret("text");
@@ -76,7 +76,7 @@
 	function updateFields()
 	{
 		var newCount = $("#text").val().split("[textinput]").length - 1;
-		var oldCount = $("#fields li").length;
+		var oldCount = $("#fields > li").length;
 		var caret = getCaret("text");
 		var pos = $("#text").val().substring(0, caret).split("[textinput]").length - 1;
 		if(newCount > oldCount)
@@ -86,11 +86,17 @@
 			{
 				index++;
 				var element = '<li>' + selectElement.replace('INDEX', index) + inputElement.replace('INDEX', index) + '</li>';
-				if($("#fields li").length > pos-1) {
-					$($("#fields li")[pos-1]).before(element);
+				if($("#fields > li").length > 0)
+				{
+					if($("#fields > li").length > pos-1) {
+						$($("#fields > li")[pos-1]).before(element);
+					}
+					else {
+						$($("#fields > li")[pos-2]).after(element);
+					}
 				}
 				else {
-					$($("#fields li")[pos-2]).after(element);
+					$("#fields").append(element);
 				}
 			}
 		}
@@ -98,7 +104,7 @@
 		{
 			// Remove fields
 			for(var i=oldCount; i>newCount; i--) {
-				$($("#fields li")[pos]).remove();
+				$($("#fields > li")[pos]).remove();
 			}
 		}
 	}