Add waterway=waterfall support (self-made icon). Tweaks.