@joleroi - is it a good idea to add the second point you mention above to this PR? (up to you)
For what is here: I'm confused by all those models. What is
Let me know when this PR is ready for review, and please put a better PR title (for the changelog we just copy & paste PR titles).
I don't know, it was your idea.
About the models: I thinks it's pretty clear the way it was before, but that might be related to the fact that I wrote the code. I don't want to spend much time on this. So either someone comes up with concrete suggestions or I suggest we close this and #1333