diff --git a/glyphs/autobuilds.ptl b/glyphs/autobuilds.ptl
index 9340c3e..38ea818 100644
--- a/glyphs/autobuilds.ptl
+++ b/glyphs/autobuilds.ptl
@@ -65,20 +65,20 @@ define customDecompositions {
 	."\u04AB" "\u0441\u0327"
 	
 	# Spacing modifers
-	."`"      " \u0300"
+#	."`"      " \u0300"
 	."\u02CB" " \u0300"
-	."\u00B4" " \u0301"
+#	."\u00B4" " \u0301"
 	."\u02CA" " \u0301"
-	."^"      " \u0302"
+#	."^"      " \u0302"
 	."\u02C6" " \u0302"
-	."~"      " \u0303"
+#	."~"      " \u0303"
 	."\u02DC" " \u0303"
 	."\u00AF" " \u0304"
 	."\u02C9" " \u0304"
 	."\u02D8" " \u0306"
 	."\u02D9" " \u0307"
 	."\u00A8" " \u0308"
-	."\u00B0" " \u030A"
+#	."\u00B0" " \u030A"
 	."\u02DA" " \u030A"
 	."\u02C7" " \u030C"
 	."\u00B8" " \u0327"
@@ -96,6 +96,8 @@ define customDecompositions {
 	."\u02DF" " \u033D"
 	."\u02EC" " \u032C"
 	."\u02ED" " \u033F"
+	."\u02F3" " \u0325"
+	."\u02F7" " \u0330"
 
 	."\u1FED" " \u0308\u0300"
 	."\u1FEE" " \u0308\u0301"
@@ -215,6 +217,19 @@ symbol-block "Manual Precomposites"
 	composite 'i.italic' glyphs.'dotlessi.italic' glyphs.dotAbove
 	composite 'i.hooky' glyphs.'dotlessi.hooky' glyphs.dotAbove
 	composite 'i.zshaped' glyphs.'dotlessi.zshaped' glyphs.dotAbove
+	
+	local MarkZoom : glyph-construction
+		apply-transform : Upright
+		apply-transform : Translate (-MIDDLE) (-XH - ACCENT)
+		apply-transform : Scale ((RIGHTSB - SB) / (markExtend * 3))
+		apply-transform : Translate (MIDDLE) (XH + ACCENT)
+		apply-transform : Italify 
+	
+	composite 'asciitilde' glyphs.space glyphs.tildeAbove MarkZoom [into-unicode '~']
+	composite 'asciigrave' glyphs.space glyphs.graveAbove MarkZoom [into-unicode '`']
+	composite 'asciicaret' glyphs.space glyphs.circumflexAbove MarkZoom [into-unicode '^']
+	composite 'latin1acute' glyphs.space glyphs.acuteAbove MarkZoom [into-unicode 0xB4]
+	composite 'degree' glyphs.space glyphs.ringAbove MarkZoom [into-unicode 0xB0]
 
 define [suggestName name] : begin
 	if glyphs.(name) : begin
diff --git a/glyphs/overmarks.ptl b/glyphs/overmarks.ptl
index 485bd06..8dc90f9 100644
--- a/glyphs/overmarks.ptl
+++ b/glyphs/overmarks.ptl
@@ -110,14 +110,14 @@ symbol-block 'Above marks'
 		
 		local tildeWave [linreg 16 2.5 90 1.33 (markHalfStroke * 2)]
 		local tildeWaveX 0.52
-		local tildeWaveEnd : [smoothreg {16 60 90} {0 (-0.1) 0}] (markHalfStroke * 2)
+		local tildeWaveEnd : [smoothreg {16 60 90} {0 (-0.0375) 0}] (markHalfStroke * 2)
 		
 		local s : new Stroke
 		local outlines : s.set-transform globalTransform
 		:.start-from leftEnd [mix tbot ttop tildeWaveEnd]
 		:.set-width  markHalfStroke markHalfStroke
 		:.cubic-to   [mix leftEnd rightEnd tildeWaveX] [mix bot top tildeWave] [mix leftEnd rightEnd (1 - tildeWaveX)] [mix bot top (1 - tildeWave)] rightEnd [mix tbot ttop (1 - tildeWaveEnd)]
-		:.set-samples    22
+		:.set-samples 32
 		:.to-outline
 		
 		include outlines
diff --git a/glyphs/symbol-punctuation.ptl b/glyphs/symbol-punctuation.ptl
index 4a652d4..2e346a0 100644
--- a/glyphs/symbol-punctuation.ptl
+++ b/glyphs/symbol-punctuation.ptl
@@ -99,13 +99,13 @@ symbol-block 'Brackets'
 		assign-unicode 0x2329
 		local fatten : Math.hypot 1 (([mix SB RIGHTSB : parenInside - parenOutside] - O) / (parenTop - parenMid))
 		include : dispiro
-			widths.lhs
+			widths.lhs OPERATORSTROKE
 			flat [mix SB RIGHTSB parenInside] parenTop
-			curl ([mix SB RIGHTSB parenOutside] + O) parenMid [widths.heading (STROKE * fatten) 0 DOWNWARD]
+			curl ([mix SB RIGHTSB parenOutside] + O) parenMid [widths.heading (OPERATORSTROKE * fatten) 0 DOWNWARD]
 		include : dispiro
-			widths.rhs
+			widths.rhs OPERATORSTROKE
 			flat [mix SB RIGHTSB parenInside] parenBot
-			curl ([mix SB RIGHTSB parenOutside] + O) parenMid [widths.heading 0 (STROKE * fatten) UPWARD]
+			curl ([mix SB RIGHTSB parenOutside] + O) parenMid [widths.heading 0 (OPERATORSTROKE * fatten) UPWARD]
 	alias 'mangleLeft' 0x27E8 'angleLeft'
 	
 	turned 'angleRight' 0x232A 'angleLeft' MIDDLE parenMid