Fixed bugs.
Updated Router class.