more cleanup, added config.yaml