Further minor updates, testing, and research.