Update drowning

Needed if #851 gets merged
Fix typo in flower generation
Merge remote-tracking branch 'upstream/master' into weather
flowers