Finished addData()... functions

And I made some other changes...