fix eventlistener and commands