fixed some small data issues