Thank you alexis_mc
Your #5 patch fixed almost all issues. But I found a few ...