bug fixes and redid routes allocation