Better about and small bug fix