Added capacity limit to events and other minor tweaks