also build cli tool
fix router calls