a

fixed some event calls