Improvments of the  Class and the plots