Final fixes and photo update