some improvements to upcoming events