Extending and bugfixing NLP component; Good enough for now.