wurstsalat, I've sent some PRs. I have a few more tweaks in mind, but happy to hear any feedback :)
Hugo: thanks a lot!