Feedback on version 2.0 dev

Hi Felix,

I've created a PR for best reviewing experience. I hope this bugfixes will target the issues you've found on your latest review session.

Best,

tommy