Improve some of the descriptions added in r68482