added labeled edit texts
cleaned up some code
changed xml writing code