Update config.yml and some housekeeping