Fix documentation with Ben suggestions,