Config refinement
Fix config.js
Fix config.js
Cleanup