More routing implementation, xml parsing, bugfixes