Last modification mainly in geomutil