Include file

One fix for b-tagging and some updates/clean-ups.