Fixed most of the bugs in Photo, but some still remain.