Updating documentation based on comments from Ulrich