fixed type bug and changed column names