session: improved univariate plot
session: some refactoring