useage and add data + minor fixes