simpler declarations, fixes to fit source music notation