Updating: improving libats/ML/funmap