fix config_vars output; minor cleanup