Makes some places clearer, cleans up cruft, and adds references to the main documentation as required.