Bug fixes to address previous changes in recent commits. Code compiles
Give consistent names to the histograms
Embedded jet container in event containers
Comments clean up