Add "quit" shortcut for interactive mode
Maybe fix some crashes