small mods on behavior / added new router for internal server / bugfix