Fixes event bug and underscore updated