Still early changes

Mostly changes to config.yml