Fixed Error with text fields, added back the XML messages