Another pass with minor corrections.