done, with the other fixes, doing some tests then commit and push.