fix some data management features, add various items for later