Photos and more fixes