small tweaks
Get rid of references to old OpenCV C API