improved the data, fixed a bug