Fix grammar, add autocompletion