fix several things in DataController