better default-route-handling + beautify