Fixed lint issues, renamed events, fixed some bugs.