3.521 Many small fixes

And some very small steps forward