change date+class fixed

other minor bugs fixed as well