Updated Script tools to fix complex geometries