fixed wrong arguments for some events