So after following the Boat Down on the Nooch thread and learning that one of the boats had an oar lock failure, it got me thinking about what else I/We should carry for safety, survival, repairs etc.... Let's face it we are floating down wilderness rivers, [Bleeeeep!] can hit the fan really fast and sometimes there may not be any help for some time. I carry the basics, but I think it's time to reevaluate my safety gear. I currently carry the following

Life jackets and whistles for all passengers
Very basic first aid kit
extra oar
extra rope
water and food for the day
matches in water proof sack
flashlights
crap paper

Items I need to add to boat

extra oarlock
handheld gps
considering storing some block and tackle or comealong in case I ever have to portage the DB

Anything else you guys carry or have considered carrying on your boat?