i3: a lot of improvements ...