fixed a couple of things when there aren't any events