More doc commenting and method renaming.