Fixed some bugs - event issue to be fixed!