fixed event handler and script files