fixes from Marko + add comments
Merge branch 'master' of https://github.com/CJLST/ZZAnalysis