More work on the User Guide.