server fixes, routing