Update Config, routes and minor things