fixed some routing issues