fixed some routing problems