Filteroptions, variable names and comments

Filteroptions are now visible when a filter is set, changes in
variablenames, comments added.