fixed some stuff in the data management section