add cutflow and a couple of tidy ups