finalize some small bug