Update data, and fix report bugs