Fixes for #20 and improvements like suggested in #22

fixes #20 (closed) and implements the suggestions of #22 (closed)

The legend isn't perfect yet, but usable.