redid classes and other pages