Converted notes to dataAttributes::InternalAttributes. Most of the rest of the changes are tweaks to the data file
Merge remote-tracking branch 'origin/master'