Ok, let's see what @oni-link thinks about this, and then I'll add a couple of commits with your suggestions.