My assorted xml tuning updated