Fixed ornament after bug. Started in on to_lilypond. Other cleanups