Finished data extraction

finished the xml extraction for new forms
cleaned up some
new form dumps you on main activity upon save