i3: many fix