diff --git a/kparse.go b/kparse.go
index 5e26bba1..d92f8392 100644
--- a/kparse.go
+++ b/kparse.go
@@ -21,38 +21,41 @@ var k_en_main int = 111
 // line 13 "kparse.rl"
 
 
-// Parse a private key file as defined in XXX.
+// PrivateKey parses a private key file as defined in XXX.
 // A map[string]string is returned with the values. All the keys
 // are in lowercase. The algorithm is returned as m[algorithm] = "RSASHA1"
 func (kp *Parser) PrivateKey() (m map[string]string, err os.Error) {
         m = make(map[string]string)
-        var k string
+        var (
+            k, data string
+            cs, p, pe int
+        )
         lines := strings.SplitAfter(string(kp.buf), "\n", -1)
         for _, data := range lines {
-            cs, p, pe := 0, 0, len(data)
+            cs, p, pe = 0, 0, len(data)
             mark := 0
 
         
-// line 37 "kparse.go"
+// line 40 "kparse.go"
 	cs = k_start
 
-// line 40 "kparse.go"
+// line 43 "kparse.go"
 	{
 	if p == pe { goto _test_eof }
 	switch cs {
 	case -666: // i am a hack D:
 tr13:
-// line 29 "kparse.rl"
+// line 32 "kparse.rl"
 	{ m[k] = data[mark:p] }
 	goto st111
 tr28:
-// line 30 "kparse.rl"
+// line 33 "kparse.rl"
 	{ m[k] = strings.ToUpper(data[mark:p-1]) }
 	goto st111
 tr40:
-// line 29 "kparse.rl"
+// line 32 "kparse.rl"
 	{ m[k] = data[mark:p] }
-// line 30 "kparse.rl"
+// line 33 "kparse.rl"
 	{ m[k] = strings.ToUpper(data[mark:p-1]) }
 	goto st111
 st111:
@@ -60,7 +63,7 @@ st111:
 	if p == pe { goto _test_eof111 }
 	fallthrough
 case 111:
-// line 64 "kparse.go"
+// line 67 "kparse.go"
 	switch data[p] {
 		case 65: goto tr110
 		case 67: goto tr111
@@ -81,7 +84,7 @@ st0:
 cs = 0;
 	goto _out;
 tr110:
-// line 27 "kparse.rl"
+// line 30 "kparse.rl"
 	{ mark = p }
 	goto st1
 st1:
@@ -89,7 +92,7 @@ st1:
 	if p == pe { goto _test_eof1 }
 	fallthrough
 case 1:
-// line 93 "kparse.go"
+// line 96 "kparse.go"
 	switch data[p] {
 		case 67: goto st2
 		case 76: goto st37
@@ -165,7 +168,7 @@ case 8:
 	if data[p] == 58 { goto tr9 }
 	goto st0
 tr9:
-// line 28 "kparse.rl"
+// line 31 "kparse.rl"
 	{ k = strings.ToLower(data[mark:p]) }
 	goto st9
 st9:
@@ -173,7 +176,7 @@ st9:
 	if p == pe { goto _test_eof9 }
 	fallthrough
 case 9:
-// line 177 "kparse.go"
+// line 180 "kparse.go"
 	if data[p] == 32 { goto st10 }
 	goto st0
 st10:
@@ -204,7 +207,7 @@ case 10:
 	}
 	goto st0
 tr11:
-// line 27 "kparse.rl"
+// line 30 "kparse.rl"
 	{ mark = p }
 	goto st11
 st11:
@@ -212,7 +215,7 @@ st11:
 	if p == pe { goto _test_eof11 }
 	fallthrough
 case 11:
-// line 216 "kparse.go"
+// line 219 "kparse.go"
 	switch data[p] {
 		case 10: goto tr13
 		case 32: goto st11
@@ -233,7 +236,7 @@ case 11:
 	}
 	goto st0
 tr12:
-// line 27 "kparse.rl"
+// line 30 "kparse.rl"
 	{ mark = p }
 	goto st12
 st12:
@@ -241,7 +244,7 @@ st12:
 	if p == pe { goto _test_eof12 }
 	fallthrough
 case 12:
-// line 245 "kparse.go"
+// line 248 "kparse.go"
 	switch data[p] {
 		case 9: goto st13
 		case 10: goto tr13
@@ -288,7 +291,7 @@ case 14:
 	}
 	goto st0
 tr19:
-// line 27 "kparse.rl"
+// line 30 "kparse.rl"
 	{ mark = p }
 	goto st15
 st15:
@@ -296,7 +299,7 @@ st15:
 	if p == pe { goto _test_eof15 }
 	fallthrough
 case 15:
-// line 300 "kparse.go"
+// line 303 "kparse.go"
 	switch data[p] {
 		case 83: goto st16
 		case 115: goto st16
@@ -430,7 +433,7 @@ case 26:
 	}
 	goto st0
 tr31:
-// line 27 "kparse.rl"
+// line 30 "kparse.rl"
 	{ mark = p }
 	goto st27
 st27:
@@ -438,7 +441,7 @@ st27:
 	if p == pe { goto _test_eof27 }
 	fallthrough
 case 27:
-// line 442 "kparse.go"
+// line 445 "kparse.go"
 	switch data[p] {
 		case 10: goto tr13
 		case 32: goto st11
@@ -757,7 +760,7 @@ case 43:
 	}
 	goto st0
 tr111:
-// line 27 "kparse.rl"
+// line 30 "kparse.rl"
 	{ mark = p }
 	goto st44
 st44:
@@ -765,7 +768,7 @@ st44:
 	if p == pe { goto _test_eof44 }
 	fallthrough
 case 44:
-// line 769 "kparse.go"
+// line 772 "kparse.go"
 	switch data[p] {
 		case 79: goto st45
 		case 82: goto st54
@@ -914,7 +917,7 @@ case 58:
 	}
 	goto st0
 tr112:
-// line 27 "kparse.rl"
+// line 30 "kparse.rl"
 	{ mark = p }
 	goto st59
 st59:
@@ -922,7 +925,7 @@ st59:
 	if p == pe { goto _test_eof59 }
 	fallthrough
 case 59:
-// line 926 "kparse.go"
+// line 929 "kparse.go"
 	switch data[p] {
 		case 88: goto st60
 		case 120: goto st60
@@ -996,7 +999,7 @@ case 66:
 	if 49 <= data[p] && data[p] <= 50 { goto st8 }
 	goto st0
 tr113:
-// line 27 "kparse.rl"
+// line 30 "kparse.rl"
 	{ mark = p }
 	goto st67
 st67:
@@ -1004,7 +1007,7 @@ st67:
 	if p == pe { goto _test_eof67 }
 	fallthrough
 case 67:
-// line 1008 "kparse.go"
+// line 1011 "kparse.go"
 	switch data[p] {
 		case 79: goto st68
 		case 111: goto st68
@@ -1068,7 +1071,7 @@ case 73:
 	if data[p] == 49 { goto st8 }
 	goto st0
 tr114:
-// line 27 "kparse.rl"
+// line 30 "kparse.rl"
 	{ mark = p }
 	goto st74
 st74:
@@ -1076,7 +1079,7 @@ st74:
 	if p == pe { goto _test_eof74 }
 	fallthrough
 case 74:
-// line 1080 "kparse.go"
+// line 1083 "kparse.go"
 	switch data[p] {
 		case 79: goto st75
 		case 111: goto st75
@@ -1133,7 +1136,7 @@ case 79:
 	}
 	goto st0
 tr115:
-// line 27 "kparse.rl"
+// line 30 "kparse.rl"
 	{ mark = p }
 	goto st80
 st80:
@@ -1141,7 +1144,7 @@ st80:
 	if p == pe { goto _test_eof80 }
 	fallthrough
 case 80:
-// line 1145 "kparse.go"
+// line 1148 "kparse.go"
 	switch data[p] {
 		case 82: goto st81
 		case 85: goto st103
@@ -1564,23 +1567,20 @@ case 110:
 	_out: {}
 	}
 
-// line 62 "kparse.rl"
+// line 65 "kparse.rl"
 
         }
 
-        /*
-        if cs < z_first_final {
-                // No clue what I'm doing what so ever
+        if cs < k_first_final {
                 if p == pe {
                         //return nil, os.ErrorString("unexpected eof")
                         println("err unexp eof")
                         return m, nil
                 } else {
                         //return nil, os.ErrorString(fmt.Sprintf("error at position %d", p))
-                        println("err ", p, "data:", string(data[p]))
+                        println("err ", p, "data:", data[p])
                         return nil, nil
                 }
         }
-        */
         return m, nil
 }
diff --git a/kparse.rl b/kparse.rl
index 0230f4e7..29e631b9 100644
--- a/kparse.rl
+++ b/kparse.rl
@@ -12,15 +12,18 @@ import (
         write data;
 }%%
 
-// Parse a private key file as defined in XXX.
+// PrivateKey parses a private key file as defined in XXX.
 // A map[string]string is returned with the values. All the keys
 // are in lowercase. The algorithm is returned as m[algorithm] = "RSASHA1"
 func (kp *Parser) PrivateKey() (m map[string]string, err os.Error) {
         m = make(map[string]string)
-        var k string
+        var (
+            k, data string
+            cs, p, pe int
+        )
         lines := strings.SplitAfter(string(kp.buf), "\n", -1)
         for _, data := range lines {
-            cs, p, pe := 0, 0, len(data)
+            cs, p, pe = 0, 0, len(data)
             mark := 0
 
         %%{
@@ -62,19 +65,16 @@ func (kp *Parser) PrivateKey() (m map[string]string, err os.Error) {
         }%%
         }
 
-        /*
-        if cs < z_first_final {
-                // No clue what I'm doing what so ever
+        if cs < k_first_final {
                 if p == pe {
                         //return nil, os.ErrorString("unexpected eof")
                         println("err unexp eof")
                         return m, nil
                 } else {
                         //return nil, os.ErrorString(fmt.Sprintf("error at position %d", p))
-                        println("err ", p, "data:", string(data[p]))
+                        println("err ", p, "data:", data[p])
                         return nil, nil
                 }
         }
-        */
         return m, nil
 }
diff --git a/zparse.go b/zparse.go
index 11054f36..403faf73 100644
--- a/zparse.go
+++ b/zparse.go
@@ -16,14 +16,14 @@ import (
 //const _IOBUF = 65365 // See comments in gdnsd
 const _IOBUF = 3e7  // TODO fix sliding window stuff in Ragel
 
-// A Parser represents a DNS master zone file parser for a 
-// particular input stream.
+// A Parser represents a DNS parser for a 
+// particular input stream. 
 type Parser struct {
     // nothing here yet
     buf    []byte
 }
 
-// NewParser create a new DNS master zone file parser from r.
+// NewParser creates a new DNS file parser from r.
 func NewParser(r io.Reader) *Parser {
         buf := make([]byte, _IOBUF) 
         n, err := r.Read(buf)
@@ -79,7 +79,7 @@ var z_en_main int = 134
 // line 71 "zparse.rl"
 
 
-// Token parses a zone file, but only returns the last RR read.
+// RR parses a zone file, but only returns the last RR read.
 func (zp *Parser) RR() RR {
     z, err := zp.Zone()
     if err != nil {
@@ -88,9 +88,7 @@ func (zp *Parser) RR() RR {
     return z.Pop().(RR)
 }
 
-// All the NewReader stuff is expensive...
-// only works for short io.Readers as we put the whole thing
-// in a string -- needs to be extended for large files (sliding window).
+// Zone parses an DNS master zone file.
 func (zp *Parser) Zone() (z *Zone, err os.Error) {
         z = new(Zone)
         data := string(zp.buf)
@@ -103,10 +101,10 @@ func (zp *Parser) Zone() (z *Zone, err os.Error) {
         hdr := new(RR_Header)
 
         
-// line 107 "zparse.go"
+// line 105 "zparse.go"
 	cs = z_start
 
-// line 110 "zparse.go"
+// line 108 "zparse.go"
 	{
 	if p == pe { goto _test_eof }
 	switch cs {
@@ -121,7 +119,7 @@ tr33:
         rr.A = net.ParseIP(rdf[0])
         z.Push(rr)
     }
-// line 102 "zparse.rl"
+// line 100 "zparse.rl"
 	{ lines++ }
 	goto st134
 tr40:
@@ -134,14 +132,14 @@ tr40:
         rr.AAAA = net.ParseIP(rdf[0])
         z.Push(rr)
     }
-// line 102 "zparse.rl"
+// line 100 "zparse.rl"
 	{ lines++ }
 	goto st134
 tr50:
 // line 179 "types.rl"
 	{
     }
-// line 102 "zparse.rl"
+// line 100 "zparse.rl"
 	{ lines++ }
 	goto st134
 tr61:
@@ -154,7 +152,7 @@ tr61:
         rr.Cname = rdf[0]
         z.Push(rr)
     }
-// line 102 "zparse.rl"
+// line 100 "zparse.rl"
 	{ lines++ }
 	goto st134
 tr70:
@@ -170,14 +168,14 @@ tr70:
         rr.Digest = rdf[3]
         z.Push(rr)
     }
-// line 102 "zparse.rl"
+// line 100 "zparse.rl"
 	{ lines++ }
 	goto st134
 tr79:
 // line 185 "types.rl"
 	{
     }
-// line 102 "zparse.rl"
+// line 100 "zparse.rl"
 	{ lines++ }
 	goto st134
 tr87:
@@ -193,7 +191,7 @@ tr87:
         rr.PublicKey = rdf[3]
         z.Push(rr)
     }
-// line 102 "zparse.rl"
+// line 100 "zparse.rl"
 	{ lines++ }
 	goto st134
 tr92:
@@ -209,7 +207,7 @@ tr92:
         rr.Digest = rdf[3]
         z.Push(rr)
     }
-// line 102 "zparse.rl"
+// line 100 "zparse.rl"
 	{ lines++ }
 	goto st134
 tr98:
@@ -223,14 +221,14 @@ tr98:
         rr.Mx = rdf[1]
         z.Push(rr)
     }
-// line 102 "zparse.rl"
+// line 100 "zparse.rl"
 	{ lines++ }
 	goto st134
 tr108:
 // line 188 "types.rl"
 	{
     }
-// line 102 "zparse.rl"
+// line 100 "zparse.rl"
 	{ lines++ }
 	goto st134
 tr114:
@@ -243,7 +241,7 @@ tr114:
         rr.Ns = rdf[0]
         z.Push(rr)
     }
-// line 102 "zparse.rl"
+// line 100 "zparse.rl"
 	{ lines++ }
 	goto st134
 tr121:
@@ -262,7 +260,7 @@ tr121:
         }
         z.Push(rr)
     }
-// line 102 "zparse.rl"
+// line 100 "zparse.rl"
 	{ lines++ }
 	goto st134
 tr127:
@@ -287,21 +285,21 @@ tr127:
         }
         z.Push(rr)
     }
-// line 102 "zparse.rl"
+// line 100 "zparse.rl"
 	{ lines++ }
 	goto st134
 tr136:
 // line 167 "types.rl"
 	{
     }
-// line 102 "zparse.rl"
+// line 100 "zparse.rl"
 	{ lines++ }
 	goto st134
 tr143:
 // line 182 "types.rl"
 	{
     }
-// line 102 "zparse.rl"
+// line 100 "zparse.rl"
 	{ lines++ }
 	goto st134
 tr152:
@@ -322,7 +320,7 @@ tr152:
         rr.Signature = rdf[9]
         z.Push(rr)
     }
-// line 102 "zparse.rl"
+// line 100 "zparse.rl"
 	{ lines++ }
 	goto st134
 tr160:
@@ -341,14 +339,14 @@ tr160:
         rr.Minttl = uint32(atoi(rdf[6]))
         z.Push(rr)
     }
-// line 102 "zparse.rl"
+// line 100 "zparse.rl"
 	{ lines++ }
 	goto st134
 tr166:
 // line 176 "types.rl"
 	{
     }
-// line 102 "zparse.rl"
+// line 100 "zparse.rl"
 	{ lines++ }
 	goto st134
 tr173:
@@ -364,18 +362,18 @@ tr173:
         rr.Digest = rdf[3]
         z.Push(rr)
     }
-// line 102 "zparse.rl"
+// line 100 "zparse.rl"
 	{ lines++ }
 	goto st134
 tr179:
 // line 173 "types.rl"
 	{
     }
-// line 102 "zparse.rl"
+// line 100 "zparse.rl"
 	{ lines++ }
 	goto st134
 tr189:
-// line 102 "zparse.rl"
+// line 100 "zparse.rl"
 	{ lines++ }
 	goto st134
 st134:
@@ -383,7 +381,7 @@ st134:
 	if p == pe { goto _test_eof134 }
 	fallthrough
 case 134:
-// line 387 "zparse.go"
+// line 385 "zparse.go"
 	switch data[p] {
 		case 9: goto st1
 		case 10: goto tr189
@@ -407,7 +405,7 @@ st0:
 cs = 0;
 	goto _out;
 tr186:
-// line 98 "zparse.rl"
+// line 96 "zparse.rl"
 	{ hdr.Name = data[mark:p] }
 	goto st1
 st1:
@@ -415,7 +413,7 @@ st1:
 	if p == pe { goto _test_eof1 }
 	fallthrough
 case 1:
-// line 419 "zparse.go"
+// line 417 "zparse.go"
 	switch data[p] {
 		case 9: goto st1
 		case 32: goto st1
@@ -445,9 +443,9 @@ case 1:
 	if 48 <= data[p] && data[p] <= 57 { goto tr2 }
 	goto st0
 tr2:
-// line 100 "zparse.rl"
+// line 98 "zparse.rl"
 	{ /* ... */ }
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st2
 st2:
@@ -455,7 +453,7 @@ st2:
 	if p == pe { goto _test_eof2 }
 	fallthrough
 case 2:
-// line 459 "zparse.go"
+// line 457 "zparse.go"
 	switch data[p] {
 		case 9: goto tr14
 		case 32: goto tr14
@@ -463,7 +461,7 @@ case 2:
 	if 48 <= data[p] && data[p] <= 57 { goto st2 }
 	goto st0
 tr14:
-// line 101 "zparse.rl"
+// line 99 "zparse.rl"
 	{ ttl := atoi(data[mark:p]); hdr.Ttl = uint32(ttl) }
 	goto st3
 st3:
@@ -471,7 +469,7 @@ st3:
 	if p == pe { goto _test_eof3 }
 	fallthrough
 case 3:
-// line 475 "zparse.go"
+// line 473 "zparse.go"
 	switch data[p] {
 		case 9: goto st3
 		case 32: goto st3
@@ -500,7 +498,7 @@ case 3:
 	}
 	goto st0
 tr3:
-// line 100 "zparse.rl"
+// line 98 "zparse.rl"
 	{ /* ... */ }
 	goto st4
 st4:
@@ -508,7 +506,7 @@ st4:
 	if p == pe { goto _test_eof4 }
 	fallthrough
 case 4:
-// line 512 "zparse.go"
+// line 510 "zparse.go"
 	switch data[p] {
 		case 9: goto st5
 		case 32: goto st5
@@ -528,7 +526,7 @@ case 5:
 	}
 	goto tr30
 tr30:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st6
 st6:
@@ -536,11 +534,11 @@ st6:
 	if p == pe { goto _test_eof6 }
 	fallthrough
 case 6:
-// line 540 "zparse.go"
+// line 538 "zparse.go"
 	if data[p] == 10 { goto tr33 }
 	goto st6
 tr31:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st7
 st7:
@@ -548,7 +546,7 @@ st7:
 	if p == pe { goto _test_eof7 }
 	fallthrough
 case 7:
-// line 552 "zparse.go"
+// line 550 "zparse.go"
 	switch data[p] {
 		case 9: goto tr31
 		case 10: goto tr33
@@ -597,7 +595,7 @@ case 11:
 	}
 	goto tr37
 tr37:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st12
 st12:
@@ -605,11 +603,11 @@ st12:
 	if p == pe { goto _test_eof12 }
 	fallthrough
 case 12:
-// line 609 "zparse.go"
+// line 607 "zparse.go"
 	if data[p] == 10 { goto tr40 }
 	goto st12
 tr38:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st13
 st13:
@@ -617,7 +615,7 @@ st13:
 	if p == pe { goto _test_eof13 }
 	fallthrough
 case 13:
-// line 621 "zparse.go"
+// line 619 "zparse.go"
 	switch data[p] {
 		case 9: goto tr38
 		case 10: goto tr40
@@ -625,7 +623,7 @@ case 13:
 	}
 	goto tr37
 tr18:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st14
 st14:
@@ -633,7 +631,7 @@ st14:
 	if p == pe { goto _test_eof14 }
 	fallthrough
 case 14:
-// line 637 "zparse.go"
+// line 635 "zparse.go"
 	switch data[p] {
 		case 69: goto st15
 		case 72: goto st21
@@ -685,7 +683,7 @@ case 18:
 	}
 	goto tr47
 tr47:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st19
 st19:
@@ -693,11 +691,11 @@ st19:
 	if p == pe { goto _test_eof19 }
 	fallthrough
 case 19:
-// line 697 "zparse.go"
+// line 695 "zparse.go"
 	if data[p] == 10 { goto tr50 }
 	goto st19
 tr48:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st20
 st20:
@@ -705,7 +703,7 @@ st20:
 	if p == pe { goto _test_eof20 }
 	fallthrough
 case 20:
-// line 709 "zparse.go"
+// line 707 "zparse.go"
 	switch data[p] {
 		case 9: goto tr48
 		case 10: goto tr50
@@ -723,11 +721,11 @@ case 21:
 	}
 	goto st0
 tr184:
-// line 101 "zparse.rl"
+// line 99 "zparse.rl"
 	{ ttl := atoi(data[mark:p]); hdr.Ttl = uint32(ttl) }
 	goto st22
 tr51:
-// line 99 "zparse.rl"
+// line 97 "zparse.rl"
 	{ hdr.Class = Str_class[data[mark:p]] }
 	goto st22
 st22:
@@ -735,7 +733,7 @@ st22:
 	if p == pe { goto _test_eof22 }
 	fallthrough
 case 22:
-// line 739 "zparse.go"
+// line 737 "zparse.go"
 	switch data[p] {
 		case 9: goto st22
 		case 32: goto st22
@@ -823,7 +821,7 @@ case 28:
 	}
 	goto tr58
 tr58:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st29
 st29:
@@ -831,11 +829,11 @@ st29:
 	if p == pe { goto _test_eof29 }
 	fallthrough
 case 29:
-// line 835 "zparse.go"
+// line 833 "zparse.go"
 	if data[p] == 10 { goto tr61 }
 	goto st29
 tr59:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st30
 st30:
@@ -843,7 +841,7 @@ st30:
 	if p == pe { goto _test_eof30 }
 	fallthrough
 case 30:
-// line 847 "zparse.go"
+// line 845 "zparse.go"
 	switch data[p] {
 		case 9: goto tr59
 		case 10: goto tr61
@@ -851,7 +849,7 @@ case 30:
 	}
 	goto tr58
 tr5:
-// line 100 "zparse.rl"
+// line 98 "zparse.rl"
 	{ /* ... */ }
 	goto st31
 st31:
@@ -859,7 +857,7 @@ st31:
 	if p == pe { goto _test_eof31 }
 	fallthrough
 case 31:
-// line 863 "zparse.go"
+// line 861 "zparse.go"
 	switch data[p] {
 		case 76: goto st32
 		case 78: goto st37
@@ -901,7 +899,7 @@ case 34:
 	}
 	goto tr67
 tr67:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st35
 st35:
@@ -909,11 +907,11 @@ st35:
 	if p == pe { goto _test_eof35 }
 	fallthrough
 case 35:
-// line 913 "zparse.go"
+// line 911 "zparse.go"
 	if data[p] == 10 { goto tr70 }
 	goto st35
 tr68:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st36
 st36:
@@ -921,7 +919,7 @@ st36:
 	if p == pe { goto _test_eof36 }
 	fallthrough
 case 36:
-// line 925 "zparse.go"
+// line 923 "zparse.go"
 	switch data[p] {
 		case 9: goto tr68
 		case 10: goto tr70
@@ -982,7 +980,7 @@ case 41:
 	}
 	goto tr76
 tr76:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st42
 st42:
@@ -990,11 +988,11 @@ st42:
 	if p == pe { goto _test_eof42 }
 	fallthrough
 case 42:
-// line 994 "zparse.go"
+// line 992 "zparse.go"
 	if data[p] == 10 { goto tr79 }
 	goto st42
 tr77:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st43
 st43:
@@ -1002,7 +1000,7 @@ st43:
 	if p == pe { goto _test_eof43 }
 	fallthrough
 case 43:
-// line 1006 "zparse.go"
+// line 1004 "zparse.go"
 	switch data[p] {
 		case 9: goto tr77
 		case 10: goto tr79
@@ -1061,7 +1059,7 @@ case 48:
 	}
 	goto tr84
 tr84:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st49
 st49:
@@ -1069,11 +1067,11 @@ st49:
 	if p == pe { goto _test_eof49 }
 	fallthrough
 case 49:
-// line 1073 "zparse.go"
+// line 1071 "zparse.go"
 	if data[p] == 10 { goto tr87 }
 	goto st49
 tr85:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st50
 st50:
@@ -1081,7 +1079,7 @@ st50:
 	if p == pe { goto _test_eof50 }
 	fallthrough
 case 50:
-// line 1085 "zparse.go"
+// line 1083 "zparse.go"
 	switch data[p] {
 		case 9: goto tr85
 		case 10: goto tr87
@@ -1110,7 +1108,7 @@ case 52:
 	}
 	goto tr89
 tr89:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st53
 st53:
@@ -1118,11 +1116,11 @@ st53:
 	if p == pe { goto _test_eof53 }
 	fallthrough
 case 53:
-// line 1122 "zparse.go"
+// line 1120 "zparse.go"
 	if data[p] == 10 { goto tr92 }
 	goto st53
 tr90:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st54
 st54:
@@ -1130,7 +1128,7 @@ st54:
 	if p == pe { goto _test_eof54 }
 	fallthrough
 case 54:
-// line 1134 "zparse.go"
+// line 1132 "zparse.go"
 	switch data[p] {
 		case 9: goto tr90
 		case 10: goto tr92
@@ -1138,7 +1136,7 @@ case 54:
 	}
 	goto tr89
 tr8:
-// line 100 "zparse.rl"
+// line 98 "zparse.rl"
 	{ /* ... */ }
 	goto st55
 st55:
@@ -1146,7 +1144,7 @@ st55:
 	if p == pe { goto _test_eof55 }
 	fallthrough
 case 55:
-// line 1150 "zparse.go"
+// line 1148 "zparse.go"
 	switch data[p] {
 		case 88: goto st56
 		case 120: goto st56
@@ -1174,7 +1172,7 @@ case 57:
 	}
 	goto tr95
 tr95:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st58
 st58:
@@ -1182,11 +1180,11 @@ st58:
 	if p == pe { goto _test_eof58 }
 	fallthrough
 case 58:
-// line 1186 "zparse.go"
+// line 1184 "zparse.go"
 	if data[p] == 10 { goto tr98 }
 	goto st58
 tr96:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st59
 st59:
@@ -1194,7 +1192,7 @@ st59:
 	if p == pe { goto _test_eof59 }
 	fallthrough
 case 59:
-// line 1198 "zparse.go"
+// line 1196 "zparse.go"
 	switch data[p] {
 		case 9: goto tr96
 		case 10: goto tr98
@@ -1202,7 +1200,7 @@ case 59:
 	}
 	goto tr95
 tr9:
-// line 100 "zparse.rl"
+// line 98 "zparse.rl"
 	{ /* ... */ }
 	goto st60
 st60:
@@ -1210,7 +1208,7 @@ st60:
 	if p == pe { goto _test_eof60 }
 	fallthrough
 case 60:
-// line 1214 "zparse.go"
+// line 1212 "zparse.go"
 	switch data[p] {
 		case 65: goto st61
 		case 83: goto st68
@@ -1270,7 +1268,7 @@ case 65:
 	}
 	goto tr105
 tr105:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st66
 st66:
@@ -1278,11 +1276,11 @@ st66:
 	if p == pe { goto _test_eof66 }
 	fallthrough
 case 66:
-// line 1282 "zparse.go"
+// line 1280 "zparse.go"
 	if data[p] == 10 { goto tr108 }
 	goto st66
 tr106:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st67
 st67:
@@ -1290,7 +1288,7 @@ st67:
 	if p == pe { goto _test_eof67 }
 	fallthrough
 case 67:
-// line 1294 "zparse.go"
+// line 1292 "zparse.go"
 	switch data[p] {
 		case 9: goto tr106
 		case 10: goto tr108
@@ -1321,7 +1319,7 @@ case 69:
 	}
 	goto tr111
 tr111:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st70
 st70:
@@ -1329,11 +1327,11 @@ st70:
 	if p == pe { goto _test_eof70 }
 	fallthrough
 case 70:
-// line 1333 "zparse.go"
+// line 1331 "zparse.go"
 	if data[p] == 10 { goto tr114 }
 	goto st70
 tr112:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st71
 st71:
@@ -1341,7 +1339,7 @@ st71:
 	if p == pe { goto _test_eof71 }
 	fallthrough
 case 71:
-// line 1345 "zparse.go"
+// line 1343 "zparse.go"
 	switch data[p] {
 		case 9: goto tr112
 		case 10: goto tr114
@@ -1381,7 +1379,7 @@ case 74:
 	}
 	goto tr118
 tr118:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st75
 st75:
@@ -1389,11 +1387,11 @@ st75:
 	if p == pe { goto _test_eof75 }
 	fallthrough
 case 75:
-// line 1393 "zparse.go"
+// line 1391 "zparse.go"
 	if data[p] == 10 { goto tr121 }
 	goto st75
 tr119:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st76
 st76:
@@ -1401,7 +1399,7 @@ st76:
 	if p == pe { goto _test_eof76 }
 	fallthrough
 case 76:
-// line 1405 "zparse.go"
+// line 1403 "zparse.go"
 	switch data[p] {
 		case 9: goto tr119
 		case 10: goto tr121
@@ -1432,7 +1430,7 @@ case 78:
 	}
 	goto tr124
 tr124:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st79
 st79:
@@ -1440,11 +1438,11 @@ st79:
 	if p == pe { goto _test_eof79 }
 	fallthrough
 case 79:
-// line 1444 "zparse.go"
+// line 1442 "zparse.go"
 	if data[p] == 10 { goto tr127 }
 	goto st79
 tr125:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st80
 st80:
@@ -1452,7 +1450,7 @@ st80:
 	if p == pe { goto _test_eof80 }
 	fallthrough
 case 80:
-// line 1456 "zparse.go"
+// line 1454 "zparse.go"
 	switch data[p] {
 		case 9: goto tr125
 		case 10: goto tr127
@@ -1521,7 +1519,7 @@ case 86:
 	}
 	goto tr133
 tr133:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st87
 st87:
@@ -1529,11 +1527,11 @@ st87:
 	if p == pe { goto _test_eof87 }
 	fallthrough
 case 87:
-// line 1533 "zparse.go"
+// line 1531 "zparse.go"
 	if data[p] == 10 { goto tr136 }
 	goto st87
 tr134:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st88
 st88:
@@ -1541,7 +1539,7 @@ st88:
 	if p == pe { goto _test_eof88 }
 	fallthrough
 case 88:
-// line 1545 "zparse.go"
+// line 1543 "zparse.go"
 	switch data[p] {
 		case 9: goto tr134
 		case 10: goto tr136
@@ -1549,7 +1547,7 @@ case 88:
 	}
 	goto tr133
 tr10:
-// line 100 "zparse.rl"
+// line 98 "zparse.rl"
 	{ /* ... */ }
 	goto st89
 st89:
@@ -1557,7 +1555,7 @@ st89:
 	if p == pe { goto _test_eof89 }
 	fallthrough
 case 89:
-// line 1561 "zparse.go"
+// line 1559 "zparse.go"
 	switch data[p] {
 		case 84: goto st90
 		case 116: goto st90
@@ -1595,7 +1593,7 @@ case 92:
 	}
 	goto tr140
 tr140:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st93
 st93:
@@ -1603,11 +1601,11 @@ st93:
 	if p == pe { goto _test_eof93 }
 	fallthrough
 case 93:
-// line 1607 "zparse.go"
+// line 1605 "zparse.go"
 	if data[p] == 10 { goto tr143 }
 	goto st93
 tr141:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st94
 st94:
@@ -1615,7 +1613,7 @@ st94:
 	if p == pe { goto _test_eof94 }
 	fallthrough
 case 94:
-// line 1619 "zparse.go"
+// line 1617 "zparse.go"
 	switch data[p] {
 		case 9: goto tr141
 		case 10: goto tr143
@@ -1623,7 +1621,7 @@ case 94:
 	}
 	goto tr140
 tr11:
-// line 100 "zparse.rl"
+// line 98 "zparse.rl"
 	{ /* ... */ }
 	goto st95
 st95:
@@ -1631,7 +1629,7 @@ st95:
 	if p == pe { goto _test_eof95 }
 	fallthrough
 case 95:
-// line 1635 "zparse.go"
+// line 1633 "zparse.go"
 	switch data[p] {
 		case 82: goto st96
 		case 114: goto st96
@@ -1689,7 +1687,7 @@ case 100:
 	}
 	goto tr149
 tr149:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st101
 st101:
@@ -1697,11 +1695,11 @@ st101:
 	if p == pe { goto _test_eof101 }
 	fallthrough
 case 101:
-// line 1701 "zparse.go"
+// line 1699 "zparse.go"
 	if data[p] == 10 { goto tr152 }
 	goto st101
 tr150:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st102
 st102:
@@ -1709,7 +1707,7 @@ st102:
 	if p == pe { goto _test_eof102 }
 	fallthrough
 case 102:
-// line 1713 "zparse.go"
+// line 1711 "zparse.go"
 	switch data[p] {
 		case 9: goto tr150
 		case 10: goto tr152
@@ -1717,7 +1715,7 @@ case 102:
 	}
 	goto tr149
 tr12:
-// line 100 "zparse.rl"
+// line 98 "zparse.rl"
 	{ /* ... */ }
 	goto st103
 st103:
@@ -1725,7 +1723,7 @@ st103:
 	if p == pe { goto _test_eof103 }
 	fallthrough
 case 103:
-// line 1729 "zparse.go"
+// line 1727 "zparse.go"
 	switch data[p] {
 		case 79: goto st104
 		case 82: goto st109
@@ -1765,7 +1763,7 @@ case 106:
 	}
 	goto tr157
 tr157:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st107
 st107:
@@ -1773,11 +1771,11 @@ st107:
 	if p == pe { goto _test_eof107 }
 	fallthrough
 case 107:
-// line 1777 "zparse.go"
+// line 1775 "zparse.go"
 	if data[p] == 10 { goto tr160 }
 	goto st107
 tr158:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st108
 st108:
@@ -1785,7 +1783,7 @@ st108:
 	if p == pe { goto _test_eof108 }
 	fallthrough
 case 108:
-// line 1789 "zparse.go"
+// line 1787 "zparse.go"
 	switch data[p] {
 		case 9: goto tr158
 		case 10: goto tr160
@@ -1824,7 +1822,7 @@ case 111:
 	}
 	goto tr163
 tr163:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st112
 st112:
@@ -1832,11 +1830,11 @@ st112:
 	if p == pe { goto _test_eof112 }
 	fallthrough
 case 112:
-// line 1836 "zparse.go"
+// line 1834 "zparse.go"
 	if data[p] == 10 { goto tr166 }
 	goto st112
 tr164:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st113
 st113:
@@ -1844,7 +1842,7 @@ st113:
 	if p == pe { goto _test_eof113 }
 	fallthrough
 case 113:
-// line 1848 "zparse.go"
+// line 1846 "zparse.go"
 	switch data[p] {
 		case 9: goto tr164
 		case 10: goto tr166
@@ -1852,7 +1850,7 @@ case 113:
 	}
 	goto tr163
 tr13:
-// line 100 "zparse.rl"
+// line 98 "zparse.rl"
 	{ /* ... */ }
 	goto st114
 st114:
@@ -1860,7 +1858,7 @@ st114:
 	if p == pe { goto _test_eof114 }
 	fallthrough
 case 114:
-// line 1864 "zparse.go"
+// line 1862 "zparse.go"
 	switch data[p] {
 		case 65: goto st115
 		case 88: goto st119
@@ -1890,7 +1888,7 @@ case 116:
 	}
 	goto tr170
 tr170:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st117
 st117:
@@ -1898,11 +1896,11 @@ st117:
 	if p == pe { goto _test_eof117 }
 	fallthrough
 case 117:
-// line 1902 "zparse.go"
+// line 1900 "zparse.go"
 	if data[p] == 10 { goto tr173 }
 	goto st117
 tr171:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st118
 st118:
@@ -1910,7 +1908,7 @@ st118:
 	if p == pe { goto _test_eof118 }
 	fallthrough
 case 118:
-// line 1914 "zparse.go"
+// line 1912 "zparse.go"
 	switch data[p] {
 		case 9: goto tr171
 		case 10: goto tr173
@@ -1949,7 +1947,7 @@ case 121:
 	}
 	goto tr176
 tr176:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st122
 st122:
@@ -1957,11 +1955,11 @@ st122:
 	if p == pe { goto _test_eof122 }
 	fallthrough
 case 122:
-// line 1961 "zparse.go"
+// line 1959 "zparse.go"
 	if data[p] == 10 { goto tr179 }
 	goto st122
 tr177:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st123
 st123:
@@ -1969,7 +1967,7 @@ st123:
 	if p == pe { goto _test_eof123 }
 	fallthrough
 case 123:
-// line 1973 "zparse.go"
+// line 1971 "zparse.go"
 	switch data[p] {
 		case 9: goto tr177
 		case 10: goto tr179
@@ -1977,7 +1975,7 @@ case 123:
 	}
 	goto tr176
 tr20:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st124
 st124:
@@ -1985,14 +1983,14 @@ st124:
 	if p == pe { goto _test_eof124 }
 	fallthrough
 case 124:
-// line 1989 "zparse.go"
+// line 1987 "zparse.go"
 	switch data[p] {
 		case 83: goto st21
 		case 115: goto st21
 	}
 	goto st0
 tr21:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st125
 st125:
@@ -2000,16 +1998,16 @@ st125:
 	if p == pe { goto _test_eof125 }
 	fallthrough
 case 125:
-// line 2004 "zparse.go"
+// line 2002 "zparse.go"
 	switch data[p] {
 		case 78: goto st21
 		case 110: goto st21
 	}
 	goto st0
 tr4:
-// line 100 "zparse.rl"
+// line 98 "zparse.rl"
 	{ /* ... */ }
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st126
 st126:
@@ -2017,7 +2015,7 @@ st126:
 	if p == pe { goto _test_eof126 }
 	fallthrough
 case 126:
-// line 2021 "zparse.go"
+// line 2019 "zparse.go"
 	switch data[p] {
 		case 69: goto st15
 		case 72: goto st127
@@ -2038,7 +2036,7 @@ case 127:
 	}
 	goto st0
 tr181:
-// line 99 "zparse.rl"
+// line 97 "zparse.rl"
 	{ hdr.Class = Str_class[data[mark:p]] }
 	goto st128
 st128:
@@ -2046,7 +2044,7 @@ st128:
 	if p == pe { goto _test_eof128 }
 	fallthrough
 case 128:
-// line 2050 "zparse.go"
+// line 2048 "zparse.go"
 	switch data[p] {
 		case 9: goto st128
 		case 32: goto st128
@@ -2072,7 +2070,7 @@ case 128:
 	if 48 <= data[p] && data[p] <= 57 { goto tr183 }
 	goto st0
 tr183:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st129
 st129:
@@ -2080,7 +2078,7 @@ st129:
 	if p == pe { goto _test_eof129 }
 	fallthrough
 case 129:
-// line 2084 "zparse.go"
+// line 2082 "zparse.go"
 	switch data[p] {
 		case 9: goto tr184
 		case 32: goto tr184
@@ -2088,9 +2086,9 @@ case 129:
 	if 48 <= data[p] && data[p] <= 57 { goto st129 }
 	goto st0
 tr6:
-// line 100 "zparse.rl"
+// line 98 "zparse.rl"
 	{ /* ... */ }
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st130
 st130:
@@ -2098,16 +2096,16 @@ st130:
 	if p == pe { goto _test_eof130 }
 	fallthrough
 case 130:
-// line 2102 "zparse.go"
+// line 2100 "zparse.go"
 	switch data[p] {
 		case 83: goto st127
 		case 115: goto st127
 	}
 	goto st0
 tr7:
-// line 100 "zparse.rl"
+// line 98 "zparse.rl"
 	{ /* ... */ }
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st131
 st131:
@@ -2115,14 +2113,14 @@ st131:
 	if p == pe { goto _test_eof131 }
 	fallthrough
 case 131:
-// line 2119 "zparse.go"
+// line 2117 "zparse.go"
 	switch data[p] {
 		case 78: goto st127
 		case 110: goto st127
 	}
 	goto st0
 tr190:
-// line 97 "zparse.rl"
+// line 95 "zparse.rl"
 	{ mark = p }
 	goto st132
 st132:
@@ -2130,7 +2128,7 @@ st132:
 	if p == pe { goto _test_eof132 }
 	fallthrough
 case 132:
-// line 2134 "zparse.go"
+// line 2132 "zparse.go"
 	switch data[p] {
 		case 9: goto tr186
 		case 32: goto tr186
@@ -2295,15 +2293,15 @@ case 133:
 	_out: {}
 	}
 
-// line 158 "zparse.rl"
+// line 156 "zparse.rl"
 
         
         if eof > -1 {
                 if cs < z_first_final {
                         // No clue what I'm doing what so ever
                         if p == pe {
-        println("p", p, "pe", pe)
-        println("cs", cs, "z_first_final", z_first_final)
+                                println("p", p, "pe", pe)
+                                println("cs", cs, "z_first_final", z_first_final)
                                 println("unexpected eof at line ", lines)
                                 return z, nil
                         } else {