Giving pleasure to op and small bug fixed