Tweaks, cleanup, formatting. Add tourism=attraction text and lower priority in rendering types to be under buildings.