Read through the rest now (took some effort to digest, heh), and yeah, it's just a small piece. But altogether this makes things much better, nice work. I'm gonna merge.