More player events + code cleanup