Add waterway=waterfall support (self-made icon). Tweaks.
Add support of text on entrance=main,yes
Fix text
Various small fixes
LightRS: various fixes and tweaks