Fine tune and delete some small bug