Cleaner parsing of notes

This was for robustness, not new features
Add MAKE-SAMPLE-TUNE