diff --git a/22-SNG.usfm b/22-SNG.usfm
index cefd230d..4ae34fc3 100644
--- a/22-SNG.usfm
+++ b/22-SNG.usfm
@@ -10,10 +10,10 @@
 \c 1
 \p
 \v 1 The Song of Songs, which is Solomon's.
-\sp The woman speaking to herself
+\p
 \q
 \v 2 Oh, that he would kiss me with the kisses of his mouth,
-\sp The woman speaking to the man
+\p
 \q for your love is better than wine.
 \q
 \v 3 Your anointing oils have a pleasing fragrance;
@@ -21,15 +21,15 @@
 \q so the young women love you.
 \q
 \v 4 Take me with you, and we will run.
-\sp The woman speaking to herself
+\p
 \q The king has brought me into his rooms.
-\sp The woman speaking to the man
+\p
 \q We are glad; We rejoice about you;
 \q let us praise your love; it is better than wine.
 \q It is right for the other women to love you.
 
 \s5
-\sp The woman speaking to the other women
+\p
 \q
 \v 5 I am dark but lovely,
 \q you daughters of Jerusalem—
@@ -43,7 +43,7 @@
 \q but my own vineyard I have not kept.
 
 \s5
-\sp The woman speaking to the man
+\p
 \q
 \v 7 Tell me, you whom my soul loves,
 \q where do you feed your flock?
@@ -52,7 +52,7 @@
 \q beside the flocks of your companions?
 
 \s5
-\sp The man speaking to the woman
+\p
 \q
 \v 8 If you do not know, most beautiful among women,
 \q follow the tracks of my flock,
@@ -70,7 +70,7 @@
 \q with silver studs.
 
 \s5
-\sp The woman speaking to herself
+\p
 \q
 \v 12 While the king lay on his couch,
 \q my nard emitted its fragrance.
@@ -82,14 +82,14 @@
 \q in the vineyards of En Gedi.
 
 \s5
-\sp The man speaking to the woman
+\p
 \q
 \v 15 Listen, you are beautiful, my love;
 \q listen, you are beautiful;
 \q your eyes are doves.
 
 \s5
-\sp The woman speaking to the man
+\p
 \q
 \v 16 Listen, you are handsome, my beloved, how handsome.
 \q The lush plants are our bed.
@@ -99,17 +99,17 @@
 
 \s5
 \c 2
-\sp The woman speaking to the man
+\p
 \q
 \v 1 I am a meadow flower of Sharon,
 \q a lily of the valleys.
-\sp The man speaking to the woman
+\p
 \q
 \v 2 As a lily among thorns,
 \q so is my love among the young women.
 
 \s5
-\sp The woman speaking to herself
+\p
 \q
 \v 3 As an apricot tree among the trees of the forest,
 \q so is my beloved among the young men.
@@ -120,17 +120,17 @@
 \q and his banner over me was love.
 
 \s5
-\sp The woman speaking to the man
+\p
 \q
 \v 5 Revive me with raisin cakes and refresh me with apricots,
 \q for I am weak with love.
-\sp The woman speaking to herself
+\p
 \q
 \v 6 His left hand is under my head,
 \q and his right hand embraces me.
 
 \s5
-\sp The woman speaking to the other women
+\p
 \q
 \v 7 I want you to swear, daughters of Jerusalem,
 \q by the gazelles and the does of the fields,
@@ -138,7 +138,7 @@
 \q until she pleases.
 
 \s5
-\sp The woman speaking to herself
+\p
 \q
 \v 8 There is the sound of my beloved! Listen, here he comes,
 \q leaping over the mountains,
@@ -178,7 +178,7 @@
 \q for your voice is sweet, and your face is lovely."
 
 \s5
-\sp The woman speaking to the man
+\p
 \q
 \v 15 Catch the foxes for us, the little foxes
 \q that spoil vineyards,
@@ -188,7 +188,7 @@
 \q
 \v 16 My beloved is mine, and I am his;
 \q he grazes among the lilies with pleasure.
-\sp The woman speaking to the man
+\p
 \q
 \v 17 Go away, my beloved,
 \q before the day breathes and the shadows flee away.
@@ -197,7 +197,7 @@
 
 \s5
 \c 3
-\sp The woman speaking to herself
+\p
 \q
 \v 1 At night on my bed
 \q I was longing for him whom my soul loves;
@@ -220,7 +220,7 @@
 \q into the bedroom of the one who had conceived me.
 
 \s5
-\sp The woman speaking to the other women
+\p
 \q
 \v 5 I want you to swear, daughters of Jerusalem,
 \q by the gazelles and the does of the fields,
@@ -228,7 +228,7 @@
 \q until she pleases.
 
 \s5
-\sp The woman speaking to herself
+\p
 \q
 \v 6 What is that coming up from the wilderness
 \q like a column of smoke,
@@ -254,7 +254,7 @@
 \q the back was made of gold, and the seat of purple cloth.
 \q Its interior was decorated with love
 \q by the daughters of Jerusalem.
-\sp The woman speaking to the women of Jerusalem
+\p
 \q
 \v 11 Go out, daughters of Zion, and gaze on King Solomon,
 \q bearing the crown with which his mother crowned him
@@ -263,7 +263,7 @@
 
 \s5
 \c 4
-\sp The man speaking to the woman
+\p
 \q
 \v 1 Oh, you are beautiful, my love; you are beautiful.
 \q Your eyes are doves behind your veil.
@@ -346,7 +346,7 @@
 \v 15 You are a garden spring,
 \q a well of fresh water,
 \q streams flowing down from Lebanon.
-\sp The woman speaking to the man
+\p
 \q
 \v 16 Awake, north wind; come, south wind;
 \q blow on my garden so that its spices may give off their fragrance.
@@ -355,18 +355,18 @@
 
 \s5
 \c 5
-\sp The man speaking to the woman
+\p
 \q
 \v 1 I have come into my garden, my sister, my bride;
 \q I have gathered my myrrh with my spice.
 \q I have eaten my honeycomb with my honey;
 \q I have drunk my wine with my milk.
-\sp The friends speaking to the man and the woman
+\p
 \q Eat, friends;
 \q drink and be drunk with love.
 
 \s5
-\sp The woman speaking to herself
+\p
 \q
 \v 2 I was asleep, but my heart was awake.
 \q There is the sound of my beloved knocking and saying,
@@ -404,7 +404,7 @@
 \q the guards on the walls took my cloak away from me.
 
 \s5
-\sp The woman speaking to the women of the city
+\p
 \q
 \v 8 I want you to swear, daughters of Jerusalem,
 \q that if you find my beloved—
@@ -412,7 +412,7 @@
 \q that I am weak with love.
 
 \s5
-\sp The women of the city speaking to the woman
+\p
 \q
 \v 9 How is your beloved better than another beloved man,
 \q most beautiful among women?
@@ -420,7 +420,7 @@
 \q that you ask us to take an oath like this?
 
 \s5
-\sp The woman speaking to the women of the city
+\p
 \q
 \v 10 My beloved is radiant and ruddy,
 \q outstanding among ten thousand.
@@ -458,7 +458,7 @@
 
 \s5
 \c 6
-\sp The women of Jerusalem speaking to the young woman
+\p
 \q
 \v 1 Where has your beloved gone,
 \q most beautiful among women?
@@ -466,7 +466,7 @@
 \q so that we may seek him with you?
 
 \s5
-\sp The woman speaking to herself
+\p
 \q
 \v 2 My beloved has gone down to his garden,
 \q to the beds of spices,
@@ -476,7 +476,7 @@
 \q he grazes among the lilies with pleasure.
 
 \s5
-\sp The man speaking to the woman
+\p
 \q
 \v 4 You are as beautiful as Tirzah, my love,
 \q as lovely as Jerusalem,
@@ -500,7 +500,7 @@
 \q behind your veil.
 
 \s5
-\sp The man speaking to himself
+\p
 \q
 \v 8 There are sixty queens, eighty concubines,
 \q and young women without number.
@@ -512,7 +512,7 @@
 \q the queens and the concubines saw her also, and they praised her:
 
 \s5
-\sp What the queens and the concubines said
+\p
 \q
 \v 10 "Who is this who appears like the dawn,
 \q as beautiful as the moon,
@@ -520,7 +520,7 @@
 \q as awe-inspiring as an army with its banners?"
 
 \s5
-\sp The man speaking to himself
+\p
 \q
 \v 11 I went down into the grove of nut trees
 \q to see the young growth in the valley,
@@ -532,17 +532,17 @@
 \q on the chariots of my noble people.
 
 \s5
-\sp The friends speaking to the woman
+\p
 \q
 \v 13 Turn back, turn back, you Shulammite! \f + \ft The meaning of Shulammite is uncertain. It may mean \fqa you perfect woman \fqa* or \fqa you woman from Shulam \fqa* . \f*
 \q Turn back, turn back so that we may gaze on you!
-\sp The woman speaking to the friends
+\p
 \q Why do you gaze on the Shulammite,
 \q as if on the dance of Mahanaim? \f + \ft The meaning of Mahanaim is uncertain. It may be the name of a place or "two armies." Two of the possible meanings of this last phrase of verse 13 are \fqa on the dance of Mahanaim \fqa* and \fqa on the dance between two armies \fqa* . \f*
 
 \s5
 \c 7
-\sp The man speaking to the woman
+\p
 \q
 \v 1 How beautiful your feet appear in your sandals, prince's daughter!
 \q The curves of your thighs are like jewels,
@@ -592,7 +592,7 @@
 \q gliding over the lips of those who sleep. \f + \ft Some copies of the ancient Greek translation and other ancient translations of the Hebrew copies have: \fqa over my lips and teeth \fqa* . \f*
 
 \s5
-\sp The woman speaking to the man
+\p
 \q
 \v 10 I am my beloved's,
 \q and he desires me.
@@ -616,7 +616,7 @@
 
 \s5
 \c 8
-\sp The woman speaking to the man
+\p
 \q
 \v 1 I wish that you were like my brother,
 \q who nursed at my mother's breasts.
@@ -629,24 +629,24 @@
 \q she who taught me.
 \q I would give you spiced wine to drink
 \q and some of the juice of my pomegranates.
-\sp The woman speaking to herself
+\p
 \q
 \v 3 His left hand is under my head
 \q and his right hand embraces me.
 
 \s5
-\sp The woman speaking to the other women
+\p
 \q
 \v 4 I want you to swear, daughters of Jerusalem,
 \q that you will not awaken or arouse love
 \q until she pleases.
 
 \s5
-\sp The women of Jerusalem speaking
+\p
 \q
 \v 5 Who is this who is coming up from the wilderness,
 \q leaning on her beloved?
-\sp The woman speaking to the man
+\p
 \q I awakened you under the apricot tree;
 \q there your mother conceived you;
 \q there she gave birth to you, she delivered you.
@@ -668,7 +668,7 @@
 \q the offer would be utterly despised.
 
 \s5
-\sp The woman's brothers speaking among themselves
+\p
 \q
 \v 8 We have a little sister,
 \q and her breasts have not yet grown.
@@ -683,13 +683,13 @@
 \q we will adorn her with boards of cedar.
 
 \s5
-\sp The woman speaking to herself
+\p
 \q
 \v 10 I was a wall, and my breasts were now like fortress towers;
 \q so I am in his eyes as one who brings peace. \f + \ft Some scholars read a play on the Hebrew word for "peace" and translate the Hebrew either: \fqa I am in his eyes as one who brings peace \fqa* or: \fqa so I have found favor in his eyes \fqa* . \f*
 
 \s5
-\sp The woman speaking to herself
+\p
 \q
 \v 11 Solomon had a vineyard at Baal Hamon.
 \q He gave the vineyard to those who would maintain it.
@@ -700,14 +700,14 @@
 \q and the two hundred shekels are for those who maintain its fruit.
 
 \s5
-\sp The man speaking to the woman
+\p
 \q
 \v 13 You who live in the gardens,
 \q my companions are listening for your voice;
 \q let me hear it.
 
 \s5
-\sp The woman speaking to the man
+\p
 \q
 \v 14 Hurry, my beloved,
 \q and be like a gazelle or a young stag