use addPicture instead of addFile
adding some comments
do not load uploader if not in an album
adding some debug