More routing changes, xml crash fix, and using more Date in Schema for dates