did some more work on the events and startup