Added yelp to amenities plus bugfixes