Index: ostinata/ostinata.janet
==================================================================
--- ostinata/ostinata.janet
+++ ostinata/ostinata.janet
@@ -145,18 +145,36 @@
 				:note (fn sine:note [me env n]
 					(def freq (get-in me [:notes (n :index)]))
 					[(* (me :ampl) (n :vel)) freq (get-in me [:cfg :chime])]))
 	:string (struct/with-proto <instr>
 				:name "string"
-				:cfg {:base 500 # shortest frequency
-					  :span 300 # range of frequencies
+				:cfg {:base 200 # shortest frequency
+					  :span 600 # range of frequencies
 					  :decay 0}
 				:setup freq-spread-notes
-				:note (fn drum:note [me env n]
+				:note (fn string:note [me env n]
 					(def freq (get-in me [:notes (n :index)]))
 					(def c (me :cfg))
 					[(* (me :ampl) (n :vel)) freq (- 1 (* .1 (c :decay)))]))
+	:piano (struct/with-proto <instr>
+				:name "piano"
+				:cfg {:base 400 # shortest frequency
+					  :span 600} # range of frequencies
+				:setup freq-spread-notes
+				:note (fn piano:note [me env n]
+						  (def freq (get-in me [:notes (n :index)]))
+						  [(* (me :ampl) (n :vel)) freq]))
+	:warbulator (struct/with-proto <instr>
+				:name "warbulator"
+				:cfg {:base 400 # shortest frequency
+					  :span 600 # range of frequencies
+					  :range 3}
+				:setup freq-spread-notes
+				:note (fn warbulator:note [me env n]
+						  (def freq (get-in me [:notes (n :index)]))
+						  (def c (me :cfg))
+						  [(* (me :ampl) (n :vel)) freq (c :range) (c :range)]))
 })
 
 
 (defn timecode→string [t]
 	(def μs             (%    t        1))
@@ -241,14 +259,23 @@
 		(not (nil? (get-in ins [:note-map :key->index k]))))
 	(defn draw-stat-line [timecode]
 		(def sustain @[])
 		(defn clr [& r] (:color (env :tty) ;r))
 		# (defn vbar [& r] (:vbar (env :tty) ;r))
-		(each n (get-in ins [:note-map :keys])
-			(when-let [k (get held n nil)]
-				(def k (string/format "%c" n))
-				(array/push sustain k)))
+		(def key-color-lut
+			[[0.8 0.0 0.2]
+			 [0.2 0.5 1.0]
+			 [0.3 1.0 0.2]
+			 ])
+		(let [nm (ins :note-map)]
+			(defn key->fac [k]
+				(def ki (get-in nm [:key->index (k 0)]))
+				(/ ki (nm :n)))
+			(each n (nm :keys)
+				(when-let [k (held (n 0))]
+					(array/push sustain
+						(clr (alg/vlut (key->fac n) key-color-lut) [0 0 0] n)))))
 		(:msg env "\r\e[2K%s\r"
 			  (string
 				  (if rec "\e[91m⏺"
 					      "\e[94m⏹") "\e[m"
 				  (clr [.9 .95 1] [0.1 0.2 0.4]
@@ -257,11 +284,11 @@
 				  # (vbar (/ loud 11)
 					# 	[.5 1 .25]
 					# 	[1.0 1.0 0.25]
 					# 	[.8 0 0])
 				  " " (chan :instr) "\e[96m@" (env :chan) "\e[m"
-				  " \e[1m" (if rec "record" "play") "\e[m"
+				  " \e[1m" (if rec "record" "play") "\e[m "
 				  (string/join sustain))))
 
 	(def timewarp (get-in chan [:cfg :timewarp] 1.0))
 
 	(defn advance-clock [res]
@@ -284,10 +311,14 @@
 			(ev/cancel clock-fiber nil)
 			(set clock-fiber nil))
 		(when player-fiber
 			(ev/cancel player-fiber nil)
 			(set player-fiber nil)))
+	(defn maybe-restart-clock []
+		(def restart? (not= nil clock-fiber))
+		(stop-clock)
+		(when restart? (start-clock)))
 
 	(defn ins-cmd [method & args]
 		((ins method) ins env ;args))
 	(defn stop-all-notes []
 		(eachp [k v] held
@@ -344,11 +375,11 @@
 			{:how :release :key :shift-l} (-= loud 1)
 			{:how :press   :key :shift-r} (-= loud .5)
 			{:how :release :key :shift-r} (+= loud .5)
 			{:how :press   :key :tab}
 				(do (put env :time start-time)
-					(stop-clock) (start-clock))
+					(maybe-restart-clock))
 			({:how :press :key n}
 				 (<= 0x31 n 0x39))
 				(set loud (- n 0x30))
 			({:how :press :key k}
 				 (note-key? k)
@@ -381,11 +412,11 @@
 						(struct/proto-flatten event))
 
 				))))
 
 (defn mk-channel []
-	@{:instr :sine
+	@{:instr :string
 	  :ampl 1
 	  :cfg @{}
 	  :mute false})
 
 (defn present-file [env text]
@@ -572,21 +603,24 @@
 							(set histidx (max 0 (+ n histidx)))
 						:else (return give-up))
 					(set cmd-line (buffer (history histidx)))))
 		(when (or (= (event :how) :press)
 				  (= (event :how) :repeat))
+			(defn execute []
+				(:msg env "\r\n")
+				(set histidx nil)
+				(do-cmd cmd-line env)
+				(array/push history (string cmd-line))
+				(buffer/clear cmd-line))
+			(defn complete [])
 			(match event
 				{:key :bksp} (buffer/popn cmd-line 1)
-				{:key :tab} (do)
+				{:key :tab} (complete)
 				{:key :up} (go-history -1)
 				{:key :dn} (go-history  1)
-				{:key :enter} (do
-					(:msg env "\r\n")
-					(set histidx nil)
-					(do-cmd cmd-line env)
-					(array/push history (string cmd-line))
-					(buffer/clear cmd-line))
+				{:key    :enter} (execute)
+				{:key :kp-enter} (execute)
 				{:text t} (buffer/push cmd-line t)
 				)))))
 
 (defn task-cmd [env]
 	"command input handling"

Index: ostinata/ostinata.orc
==================================================================
--- ostinata/ostinata.orc
+++ ostinata/ostinata.orc
@@ -10,10 +10,12 @@
 givol ftgen 1, 0, 10000, 25, \
 	500, 60, \
 	1000, 20, \
 	7000, 3, \
 	10000, 5
+gipian ftgen 2, 0, 10000, 10, \
+	1, 0.5, 0.3, 0.25, 0.2, 0.167, 0.14, 0.125, .111
 
 instr sine
 	tigoto skipinit
 	kt init 0
 	al init 1.0
@@ -52,5 +54,41 @@
 		aw = aw * at
 	endif
 	out aw
 endin
 
+
+instr warbulator
+	tigoto skipinit
+	irange = p6
+	ifreq = p5
+	ivol = p4 * 40 * table(ifreq, givol)
+
+	ata poscil 1.0, 100
+	atf poscil 1.0, bpf(ata, 0,1, 1,100) 
+	atq poscil 1.0, bpf(atf, 0,ifreq, 1,ifreq*irange) 
+	skipinit:
+
+	aw = atq
+	
+	if p3 >= 0 then
+		at linseg 1, p3, 0
+		aw = aw * at
+	endif
+	out ivol * aw
+endin
+
+instr bell
+	tigoto skipinit
+	ifreq = p5
+	ivol = p4 * 40 * table(ifreq, givol)
+	at poscil 1.0, ifreq*2
+	af poscil 1.0, bpfcos(at, 0,ifreq, 1,ifreq*2.5)
+
+	skipinit:
+	aw = af
+	if p3 >= 0 then
+		at linseg 1, p3, 0
+		aw = aw * at
+	endif
+	out ivol * aw
+endin