Few touches regarding output and grammar.