Adds image and mask features, fixes clippath