fixing some issues with routing