leftovers from saturday and the new routing stuff