Update geomtk commits and adapt lady codes
Follow the changes in geomtk

But there is an error when run in Debug mode, working on it.