Let's close it as since the last changes it should be mainly solved.
We can still discuss about some improvements.