Correcting little mistakes and adding new class