Revert one tweak and add config parameters && update main config fine