Fixed some bugs, Rename 1 function, Create data obj