Making yelp stuff work a little better