improvements on NB
Most is ok now, just f1score and tp/tn are wrong