fixed a few event binding