Merge "Fix docs to be clearer and more maintainable"