some minor changes, change config and label