Improved Textparsing