better OCR, bugfixes