fixing eventHandlers
Merge branch 'master' of https://github.com/deannazhu514/237-hw4
various fixes