More work on the text parsing.