Made file ids integral; protocol might now be None; added annotations for funneled images.