fixes, plus all routes separated