Improve descriptions.  Work in progress