@@ -20,11 +20,11 @@
 def main():
     composition = {
         "intro": {
             "body": {
                 "percusion": {
-                    "channel": 14,
+                    "channel": 14,  # Orchestra kit
                     "octave": 4,
                     "duration": 60,
                     "grammars": {
                         "u": ["A ^A (u)"]
                     }
@@ -31,14 +31,16 @@
                 },
                 "pan_flute": {
                     "channel": 8,
                     "octave": 5,
                     "duration": 60,
+                    "vol_offset": -15,
                     "grammars": {  # Notes for this instrument to use in this piece
-                        "u": ["C2' B2 | A3 D3 || B | C' | D | C2' C2' | z | (u)", "C2' C2' | C2' C2' | (x)"],
-                        "v": ["G2 F2 | E2 F2 | D5 (u)", "B/4 C/4' B/4 A/4 | D2 D2 | z | (u)"],
-                        "x": ["z4 | (v)"],
+                        "u": ["[C2'] C2' | [A3] A3 (u)"],
+#                        "u": ["[C2'] [B2] | [A3] D3 || B | C' | D | C2' C2' | z | (u)", "C2' C2' | C2' C2' | (x)"],
+#                        "v": ["G2 F2 | E2 F2 | D5 (u)", "B/4 C/4' B/4 A/4 | D2 D2 | z | (u)"],
+#                        "x": ["z4 | (v)"],
                     },
                 },
                 "bass": {
                     "channel": 4,
                     "sync": "pan_flute",
@@ -47,11 +49,11 @@
                     "grammars": {  # Notes for this instrument to use in this piece
                         "u": ["C/2 C/2 C/2 z/2 (u)"],
                     },
                 },
                 "horn_timbre1": { 
-                    "channel": 13,
+                    "channel": 13,  # 'Atmosphere'
                     "octave": 2,
                     "duration": 60,
                     "grammars": {  # Notes for this instrument to use in this piece
                         "u": ["C4 D4 (u)"],
                     },
@@ -142,11 +144,10 @@
                 instrs.append(instr_score)
 
                 volume = 100
                 if instr.has_key("vol_offset"):
                     volume += instr["vol_offset"]
-                    print "\t\t\tvolume offset = %d, nev volume = %d" % (instr["vol_offset"], volume)
                 midify_instr_score(instr_score, track, instr["channel"], subsection_start, volume=volume)
             longest_score = max(instrs, key=lambda i: score_len(i))
             subsection_start += score_len(longest_score)
             section_start += score_len(longest_score)
             track += 1
@@ -250,13 +251,13 @@
 def midify_instr_score(score, track, channel, t, volume):
     # Assume get_midi_note()
     global mymidi
 
     for token in score:
-        if isinstance(token, parse.Chord):  # Chords
-            for note in token.chord: 
-                note = get_midi_note(token.octave, note)
+        if isinstance(token, parse.Chord):
+            for note in token.notes: 
+                note = get_midi_note(note.octave, note.value)
                 mymidi.addNote(track=track, channel=channel,pitch=note, time=t, duration=token.duration, volume=volume)
         elif isinstance(token, parse.Note):  # Individual notes
             note = get_midi_note(token.octave, token.value)
             mymidi.addNote(track=track, channel=channel,pitch=note, time=t, duration=token.duration, volume=volume)
         elif isinstance(token, tree.Tree):