Mainly doc fixup and method reordering.