fixed, improved ocr parser