fixed more event issues