Clean up config code some more.
Added config TAB suggestions.