Update location and some clean ups
WIP: Start Yelp section