removed errors from count plots
added this model
added CPL2
added this model
oops
some print info when setting enegies is added
fixing a few things