Added more rules and keybindings