fixed more classes