event handler changes + shark/healthstone is back