Add more miscellaneous data, and fix some mis-extracted XML