Bug fixes and config.yml functionality.