- added quick fix for populating keys
- fix config