Merged.

Plus some minor edits