minor refactors and config changes.