fixed some of the setup and also the eventbirte