did some modifications and fine-tuning in most of the classes