X-SVN-Rev: 7599
Remove duplicates. Fix malformed data. Add some missing data. and so on. X-SVN-Rev: 7530
to these. X-SVN-Rev: 3243