several important bug fixes, the issues about the benchmarking