Yelp bugfix

Fixed a few bugs.