Cleanup, change keymaps & add ins/app/cha modes