Improvements to screenshotting
More tests; modifications to OCR