toggling of fill legend
merge fixes