Added some more nsfdata structs and fixed a number of bugs