Numerous updates - most for i3