Misc. fixes and updates; notably, keypad numbers now work with i3