misc tweaks. I'm going to swap out ElementTree in favor of lxml...