Doc updates as suggested by David Hay