fixed some routing problems, still more