Minor fixes and improvements
Replaced OpenCV with CImg for image loading