Added breaks in the switch.
Added the other event cases.