Links and script fix