bug fixes, removed duplicate code in eventDate