fixed regressions from last commit

fixed all the lost event handlers