PHOTO: cleanup, general improvements