updated some stuff, got new event modal working
resolved merge conflicts