fix some bug after review