Convert to LilyPond 2.18, correct some note pitches, suggest trills

Conversion and corrections