minor changes on setting