Touchup notes, spacing; add section for slightly more advanced merging