more fitting name
move stuff around, name changes
indentation fix
tests for generating xml