Finalized config system

Fixes