added message for case no occurences
changed the way yelp expands header files to avoid internesting of headers