Enable multi object / human /robot + clean a bit