some text change and improvement