title work, template work for water-death, not introducing villain unless need-be (eg, solo water-death-by-misadventure) and some bug-fixes and notes for future work