Added stuff
Stuff
changed the default names
Pretty expressions survive empty label value
Added a variable filter and cleaned up the tests.