various minor adjustments to i3