Refactored completions, fancier prompt, some more options