Added a number of CD structs to the nsfdata package and fixed bugs in others