Giant update to master

OCR, plots, many bugfixes and other improvements