Minor adjustments.
Merged conflicts.