add routs tracking and fix some bugs