Fixed, improved, and extended the photo/album Factor creation.