added photos, optimized and added waypoints