new patches, some script fixes