Added getAllImages, getAllAnnotations, made changes to some methods after Joels updates