improve hunter 2, fix some minor bug