i3 improvements