Updates to XML

Updates to config and form.