fixed router bugs and start to develop model