added Clip; new Note stuff