To fix some bug and to modify some change request.