Add help and improved completions