Fixed canny and added subpix