updated new events and slight refactor for easier updates with entities