more updates

XML is working along with Driver2. Run that for most recent stuff.