fix class dates, finish class popups