Improve shape detection and add deblur_cam