Update the .data method
Better doc, fixed some bugs