Update data.sql

More corrections
merged jimvernon-patch-2 on local
Merge branch 'jimvernon-patch-2'