Added wristwatch gadget, and moved listeners around