Changed rois to be first level indexes. Keypoint drawing seems to be pristine. I believe there is still legacy code that needs to be removed