Improved OCR, and parsing for OCR output