Change some variables and names clear out blank lines and add some logic to the config form and form builder