more improvements

I guess `2.0.x-dev` is the good branch-alias since we didn't planned to upgrade to `2.1`.

If we make some bug fixes, they should be done on `2.0.x`