simplified a bit ServiceRouter

and fixed a bug
moved out various auth commands