A few fixes based on testing, FullCalendar not behaving as documented and still some issues