fixed name and date bug