Added photo captions, fixed filename issue.

Custom filenames now work properly, photos include filename captions.