xml fix
more noodling
Another work-in-progress update