some small bug fixed