wip on draft: restructuration, evolutions and corrections ...