more fixes and add a default route