add 404. And fix router