some comments and router bug fix