fix indent and some small bug