[#438] more fixes after some heavy debug session

still need further cleaning and some code rewrite, but almost there !
(time to go home in the meanwhile)