I see. It's really more complicated than it seems at first. *haha*
But it's already really good to use in its current form and the few exceptions where it's still misleading don't even stand out.
I worked with it all day today and the folding and unfolding is really a great enrichment.
Have a nice evening :)