fixed some routing