ok forward
clean up config code && trailing spaces
Merge remote-tracking branch 'origin/fixed-config'