xml cleanup
undid breaky things. more to be done