new custom message system - and a fix for rescue on the river, I think