Optimized EventHandler a bit, tweaked the holiday season