diff --git a/Makefile b/Makefile
index da35328..be5a640 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ clean:
 
 %.crc:	%.bin.nocrc
 	cat $^ | edid-decode \
-		| sed -ne 's/^Checksum: 0x\w\+ (should be \(0x\w\+\))$$/\1/p' >$@
+		| sed -ne 's/^[ ]*Checksum: 0x\w\+ (should be \(0x\w\+\))$$/\1/p' >$@
 
 %.p:	%.crc %.S
 	cc -c -DCRC="$$(cat $*.crc)" -o $@ $*.S
diff --git a/modeline2edid b/modeline2edid
index 9140596..a3daaaa 100755
--- a/modeline2edid
+++ b/modeline2edid
@@ -62,33 +62,30 @@ template-S() {
     esac
 	local -A defines
 	defines=(
-		TIMING_NAME "${(qqq)name}"
-
-		CLOCK   "$pixel_clock_khz"
-		XPIX    "$hdisp"
-		XBLANK  "$((htotal - hdisp))"
-		XOFFSET "$((hsyncstart - hdisp))"
-		XPULSE  "$((hsyncend - hsyncstart))"
-
-		YPIX    "$vdisp"
-		YBLANK  "$((vtotal - vdisp))"
-		YOFFSET "(63+$((vsyncstart - vdisp)))"
-		YPULSE  "(63+$((vsyncend - vsyncstart)))"
-
 		VERSION "${edid_version%%.*}"
 		REVISION "${edid_version#*.}"
-
+		CLOCK   "$pixel_clock_khz"
+		XPIX    "$hdisp"
+		YPIX    "$vdisp"
 		XY_RATIO "XY_RATIO_${(U)ratio//:/_}"
+		XBLANK  "$((htotal - hdisp))"
+		YBLANK  "$((vtotal - vdisp))"
+		XOFFSET "$((hsyncstart - hdisp))"
+		XPULSE  "$((hsyncend - hsyncstart))"
+		YOFFSET "(63+$((vsyncstart - vdisp)))"
+		YPULSE  "(63+$((vsyncend - vsyncstart)))"
 		DPI "$dpi"
 		VFREQ "$vfreq_hz"
+                TIMING_NAME "${(qqq)name}"
 		HSYNC_POL "$hsync_polarity"
 		VSYNC_POL "$vsync_polarity"
 	)
 
-	local -a lines=('/* '"$name: $REPLY"' */')
+        local lines=('/* '"$name: $REPLY"' */') # removed -a option
 	local k
-	for k in ${(k)defines}; do
+	for k in "${(@k)defines}"; do
 		lines+=("#define $k ${defines[$k]}")
+
 	done
 	lines+=('#include "edid.S"')