config and routing fixes