fixed some data issues