fixed some small bug