Merge Mark's changes for the user manual
More changes from Mark