trimed dataset and fixed type errors