more routes improvements