Add more documentation strings.
Merge local changes.