fix xss scirpt links; update events;