Thanks, updated the entries
As for the tracklists, since the 2nd disc is a data cd it should follow the file name, and the mp3 files are usually separated by episode and have a particular name (see
this) so 1 track for the second cd doesn't look correct, but again this could be an exception.