Routes and configuration

Fixes