+ little renamings
+ javadoc for LegendProvider
+ revert client side as it was