Various updates.
Minor simplification.