fixing some routing problems