better classes and fixed description