API Improvements and some other minor speed improvements for events