Improvements on text-analyzer.