some inprovements in Router